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

fixing some issues with dev buildmaster config

Browse source
This commit is contained in:
Tim Flink 2017-03-16 17:22:52 +00:00
parent f85ea3cb13
commit 15c18dfc37
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,7 @@ c['schedulers'].append(ForceScheduler(
default='x86_64',
size=128)]))
{% if deployment_type in ['stg'] %}
{% if deployment_type in ['dev', 'stg'] %}
c['schedulers'].append(JobScheduler(
name="jobsched-distgit",
builderNames=['distgit'],
@ -253,13 +253,21 @@ distgit_factory = BuildFactory()
# clean out /var/tmp/taskotron (see T253)
distgit_factory.addStep(ShellCommand(command=Interpolate("rm -rf /var/tmp/taskotron/%(prop:slavename)s/*"), name="rm_tmp", descriptionDone=['Clean tmp']))
# check out the source
{% if deployment_type ['dev', 'prod'] %}
# check out the source from prod dist-git
distgit_factory.addStep(Git(repourl=Property('repo', default=Interpolate('http://pkgs01.phx2.fedoraproject.org/rpms/{}/'.format("%(prop:item)s".split('-')[0]))),
branch=Property('branch', default='master'),
mode='full',
method='clobber',
shallow=True))
{% else %}
# check out the source from stg dist-git
distgit_factory.addStep(Git(repourl=Property('repo', default=Interpolate('http://pkgs01.stg.phx2.fedoraproject.org/rpms/{}/'.format("%(prop:item)s".split('-')[0]))),
branch=Property('branch', default='master'),
mode='full',
method='clobber',
shallow=True))
{% endif %}
# run the runner
distgit_factory.addStep(ShellCommand(command=["runtask",
'-i', Interpolate('%(prop:item)s'),