From c05dba5c34d69cfa04bfd446374563dd0b28b326 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Wed, 1 Apr 2015 11:01:59 +0000 Subject: [PATCH] Enable rest of the artifacts stuff for taskotron-stg --- .../buildmaster-configure/templates/taskotron.master.cfg.j2 | 4 ++-- roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 9accdd15d3..e09fcb17bf 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -169,7 +169,7 @@ factory.addStep(ShellCommand(command=["runtask", '-t', Interpolate('%(prop:item_type)s'), '-a', Interpolate('%(prop:arch)s'), '-j', Interpolate('%(prop:buildername)s/%(prop:buildnumber)s'), -{% if deployment_type == 'dev' %} +{% if deployment_type in ['dev', 'stg'] %} '--uuid', Interpolate('%(prop:uuid)s'), {% endif %} Interpolate('%(prop:taskname)s.yml')], @@ -178,7 +178,7 @@ factory.addStep(ShellCommand(command=["runtask", logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }})) -{% if deployment_type == 'dev' %} +{% if deployment_type in ['dev', 'stg'] %} # create artifacts dir on master factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s')], descriptionDone=['Create artifacs dir'])) diff --git a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 index 90f1d0037f..c5e9bd108f 100644 --- a/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 +++ b/roles/taskotron/taskotron-client/templates/taskotron.yaml.j2 @@ -55,7 +55,7 @@ bodhi_server: {{ bodhi_server }} ## URL of ResultsDB server API interface, which can store all test results resultsdb_server: {{ resultsdb_server }} -{% if deployment_type == 'dev' %} +{% if deployment_type in ['dev', 'stg'] %} ## URL of ExecDB server API interface, which tracks task execution status execdb_server: {{ execdb_server }} {% endif %}