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

Enable rest of the artifacts stuff for taskotron-stg

Browse source
This commit is contained in:
Martin Krizek 2015-04-01 11:01:59 +00:00
parent bc798f608d
commit c05dba5c34
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -169,7 +169,7 @@ factory.addStep(ShellCommand(command=["runtask",
'-t', Interpolate('%(prop:item_type)s'), '-t', Interpolate('%(prop:item_type)s'),
'-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'),
{% if deployment_type == 'dev' %} {% if deployment_type in ['dev', 'stg'] %}
'--uuid', Interpolate('%(prop:uuid)s'), '--uuid', Interpolate('%(prop:uuid)s'),
{% endif %} {% endif %}
Interpolate('%(prop:taskname)s.yml')], Interpolate('%(prop:taskname)s.yml')],
@ -178,7 +178,7 @@ factory.addStep(ShellCommand(command=["runtask",
logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }})) logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }}))
{% if deployment_type == 'dev' %} {% if deployment_type in ['dev', 'stg'] %}
# create artifacts dir on master # create artifacts dir on master
factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s')], factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s')],
descriptionDone=['Create artifacs dir'])) descriptionDone=['Create artifacs dir']))

2
roles/taskotron/taskotron-client/templates/taskotron.yaml.j2
View file

@ -55,7 +55,7 @@ bodhi_server: {{ bodhi_server }}
## URL of ResultsDB server API interface, which can store all test results ## URL of ResultsDB server API interface, which can store all test results
resultsdb_server: {{ resultsdb_server }} 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 ## URL of ExecDB server API interface, which tracks task execution status
execdb_server: {{ execdb_server }} execdb_server: {{ execdb_server }}
{% endif %} {% endif %}