WarlockFish/fedora-infra_ansible
1
0
Fork 0
mirror of https://pagure.io/fedora-infra/ansible.git synced 2026-04-29 21:10:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of /git/ansible

Browse Source
This commit is contained in:
Ralph Bean
2015-02-26 15:15:09 +00:00
parent 378bf4854a dd6497f6c0
commit bccc632e51
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
View File

@@ -172,16 +172,15 @@ factory.addStep(ShellCommand(command=["runtask", '-i',
{% if deployment_type == 'dev' %}
# create artifacts task_output directory
factory.addStep(ShellCommand(command=['mkdir', '-p', '{{ public_artifacts_dir }}/%(prop:uuid)s/task_output']))
# copy artifacts to master
factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/'),
masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output')))
masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output'),
mode=0775))
# copy taskotron log to master
factory.addStep(FileUpload(slavesrc="/var/log/taskotron/taskotron.log",
masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log')))
masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'),
mode=0755))
{% else %}
# capture the taskotron log
factory.addStep(ShellCommand(command=["cat", "/var/log/taskotron/taskotron.log"], name="cat_log",