diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index b6fadd7779..d5a69301d1 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -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'),