From 91c8eac5f4862dba8b606b3dfcf64a4d19b48bde Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 2 Aug 2016 13:13:08 +0000 Subject: [PATCH] taskotron-dev: try working for both distgit and regular tasks --- .../buildmaster-configure/templates/taskotron.master.cfg.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 92aefe17c5..1e27e3ddd9 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -166,6 +166,9 @@ factory.addStep(Git(repourl=Property('repo', default=Interpolate('{{ grokmirror_ shallow=True)) # run the runner +{% if deployment_type in ['dev'] %} +factory.addStep(ShellCommand(command=Interpolate('cd %(prop:taskname)s &>/dev/null || runtask -i %(prop:item)s -t %(prop:item_type)s -a %(prop:arch)s -j %(prop:buildername)s/%(prop:buildnumber) --uuid %(prop:uuid)s runtask.yml', +{% else %} factory.addStep(ShellCommand(command=["runtask", '-i', Interpolate('%(prop:item)s'), '-t', Interpolate('%(prop:item_type)s'), @@ -173,6 +176,7 @@ factory.addStep(ShellCommand(command=["runtask", '-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'), '--uuid', Interpolate('%(prop:uuid)s'), 'runtask.yml'], +{% endif %} descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')], name='runtask', timeout=2400,