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

changing order of buildsteps to get desired permissions on master's copy of artifacts

Browse source
This commit is contained in:
Tim Flink 2015-02-26 17:08:53 +00:00
parent dddcbb09bf
commit f0554838b7
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,6 +172,9 @@ factory.addStep(ShellCommand(command=["runtask", '-i',
{% if deployment_type == 'dev' %}
# change permissions for uuid dir to be accessible via http
factory.addStep(ShellCommand(command=["chmod", '-R', '0755', Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/')]))
# 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')))
@ -180,9 +183,6 @@ factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifac
factory.addStep(FileUpload(slavesrc="/var/log/taskotron/taskotron.log",
masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log')))
# change permissions for uuid dir to be accessible via http
factory.addStep(ShellCommand(command=["chmod", '-R', '0755', Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/')]))
{% else %}
# capture the taskotron log
factory.addStep(ShellCommand(command=["cat", "/var/log/taskotron/taskotron.log"], name="cat_log",