Differential D809

Add support for dist-git style tasks for buildbot scheduler
ClosedPublic
Actions

Authored by mkrizek on Apr 12 2016, 10:54 AM.

Details

Reviewers
tflink
Maniphest Tasks
T750: Add support for dist-git style tasks for buildbot scheduler
Test Plan

Will test in dev once reviewed.

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped
mkrizek retitled this revision from to Add support for dist-git style tasks for buildbot scheduler.Apr 12 2016, 10:54 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added a project: infrastructure.
tflink accepted this revision.Apr 14 2016, 4:22 PM

I wonder if we might want to see if we can find a bit cleaner way of doing this but it looks ok to me, especially for dev.

This revision is now accepted and ready to land.Apr 14 2016, 4:22 PM
mkrizek closed this revision.Apr 18 2016, 11:00 AM

ok, so I had to rework this to make this actually work - https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=bcc7b5cdf69040ca2b521e9e04651a612f45fe12

Though, for now it still assumes that the yaml file is named after the task, I'll change it once we decide on naming.

Revision Contents

Diff 2065

View Options

roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2

Context not available.
158factory.addStep(ShellCommand(command=Interpolate("rm -rf /var/tmp/taskotron/%(prop:slavename)s/*"), name="rm_tmp", descriptionDone=['Clean tmp'])) 158​factory.addStep(ShellCommand(command=Interpolate("rm -rf /var/tmp/taskotron/%(prop:slavename)s/*"), name="rm_tmp", descriptionDone=['Clean tmp']))
159{% endif %} 159​{% endif %}
160 160​
161​{% if deployment_type in ['stg', 'prod'] %}
161# check out the source 162​# check out the source
162factory.addStep(Git(repourl=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/%(prop:taskname)s/'), 163​factory.addStep(Git(repourl=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/%(prop:taskname)s/'),
163 mode='full', method='clobber')) 164​ mode='full', method='clobber'))
165​{% elif deployment_type in ['dev'] %}
166​# check out the source
167​
168​distgit = Property('repo') and Property('branch')
169​
170​if distgit:
171​ factory.addStep(Git(repourl=Interpolate('%(prop:repo)s'),
172​ branch=Interpolate('%(prop:branch)s'),
173​ mode='full',
174​ method='clobber',
175​ shallow=True))
176​else:
177​ factory.addStep(Git(repourl=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/%(prop:taskname)s/'),
178​ mode='full',
179​ method='clobber'))
180​{% endif %}
164 181​
165# run the runner 182​# run the runner
166factory.addStep(ShellCommand(command=["runtask", 183​factory.addStep(ShellCommand(command=["runtask",
Context not available.
169 '-a', Interpolate('%(prop:arch)s'), 186​ '-a', Interpolate('%(prop:arch)s'),
170 '-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'), 187​ '-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'),
171 '--uuid', Interpolate('%(prop:uuid)s'), 188​ '--uuid', Interpolate('%(prop:uuid)s'),
189​{% if deployment_type in ['dev'] %}
190​ Interpolate('%(prop:taskname)s/runtask.yml') if distgit else Interpolate('%(prop:taskname)s.yml')],
191​{% else %}
172 Interpolate('%(prop:taskname)s.yml')], 192​ Interpolate('%(prop:taskname)s.yml')],
193​{% endif %}
173 descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')], 194​ descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')],
174 name='runtask', 195​ name='runtask',
175 timeout=2400, 196​ timeout=2400,
Context not available.