buildmaster-dev: make it actually work this time
This commit is contained in:
parent
4fb956d673
commit
bcc7b5cdf6
1 changed files with 5 additions and 17 deletions
|
@ -164,19 +164,11 @@ factory.addStep(Git(repourl=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}
|
||||||
mode='full', method='clobber'))
|
mode='full', method='clobber'))
|
||||||
{% elif deployment_type in ['dev'] %}
|
{% elif deployment_type in ['dev'] %}
|
||||||
# check out the source
|
# check out the source
|
||||||
|
factory.addStep(Git(repourl=Property('repo', default=Interpolate('{{ grokmirror_user }}@{{ buildmaster }}:/var/lib/git/mirror/fedoraqa/%(prop:taskname)s/')),
|
||||||
distgit = Property('repo') and Property('branch')
|
branch=Property('branch', default='{{ grokmirror_default_branch }}'),
|
||||||
|
mode='full',
|
||||||
if distgit:
|
method='clobber',
|
||||||
factory.addStep(Git(repourl=Interpolate('%(prop:repo)s'),
|
shallow=True))
|
||||||
branch=Interpolate('%(prop:branch)s'),
|
|
||||||
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 %}
|
{% endif %}
|
||||||
|
|
||||||
# run the runner
|
# run the runner
|
||||||
|
@ -186,11 +178,7 @@ factory.addStep(ShellCommand(command=["runtask",
|
||||||
'-a', Interpolate('%(prop:arch)s'),
|
'-a', Interpolate('%(prop:arch)s'),
|
||||||
'-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'),
|
'-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'),
|
||||||
'--uuid', Interpolate('%(prop:uuid)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')],
|
Interpolate('%(prop:taskname)s.yml')],
|
||||||
{% endif %}
|
|
||||||
descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')],
|
descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')],
|
||||||
name='runtask',
|
name='runtask',
|
||||||
timeout=2400,
|
timeout=2400,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue