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

buildmaster: change aritfacts dir perms on master instead of slave

Browse source
This commit is contained in:
Martin Krizek 2015-02-27 07:58:46 +00:00
parent f38370fe93
commit d6445b8bff
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,6 +143,7 @@ from buildbot.steps.shell import ShellCommand
from buildbot.process.properties import Property, Interpolate
from buildbot.steps.slave import RemoveDirectory
from buildbot.steps.transfer import DirectoryUpload, FileUpload
from buildbot.steps.master import MasterShellCommand
factory = BuildFactory()
@ -172,9 +173,6 @@ 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')))
@ -183,6 +181,9 @@ 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 on master to be accessible via http
factory.addStep(MasterShellCommand(command=["chmod", '-R', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/')]))
{% else %}
# capture the taskotron log
factory.addStep(ShellCommand(command=["cat", "/var/log/taskotron/taskotron.log"], name="cat_log",