Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

buildmaster-dev: make it actually work this time

Browse source
This commit is contained in:
Martin Krizek 2016-04-18 10:44:31 +00:00
parent 4fb956d673
commit bcc7b5cdf6
1 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
View file

@ -164,19 +164,11 @@ factory.addStep(Git(repourl=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}
mode='full', method='clobber'))
{% elif deployment_type in ['dev'] %}
# check out the source
distgit = Property('repo') and Property('branch')
if distgit:
factory.addStep(Git(repourl=Interpolate('%(prop:repo)s'),
branch=Interpolate('%(prop:branch)s'),
factory.addStep(Git(repourl=Property('repo', default=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/%(prop:taskname)s/')),
branch=Property('branch', default='{{ grokmirror_default_branch }}'),
mode='full',
method='clobber',
shallow=True))
else:
factory.addStep(Git(repourl=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/%(prop:taskname)s/'),
mode='full',
method='clobber'))
{% endif %}
# run the runner
@ -186,11 +178,7 @@ factory.addStep(ShellCommand(command=["runtask",
'-a', Interpolate('%(prop:arch)s'),
'-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'),
'--uuid', Interpolate('%(prop:uuid)s'),
{% if deployment_type in ['dev'] %}
Interpolate('%(prop:taskname)s/runtask.yml') if distgit else Interpolate('%(prop:taskname)s.yml')],
{% else %}
Interpolate('%(prop:taskname)s.yml')],
{% endif %}
descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')],
name='runtask',
timeout=2400,