From d6445b8bff89e73758be9998a34934d54d401e70 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Fri, 27 Feb 2015 07:58:46 +0000 Subject: [PATCH] buildmaster: change aritfacts dir perms on master instead of slave --- .../templates/taskotron.master.cfg.j2 | 7 ++++--- 1 file changed, 4 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 8ee465fe5c..6dda96ee2f 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -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",