From 3109826a8eae12e60d52b10e00d42c60468957ff Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Mon, 9 Mar 2015 08:39:18 +0000 Subject: [PATCH] buildmaster: put artifacts into dir according to date --- .../templates/taskotron.master.cfg.j2 | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index c423a2f2b7..6dc1ce2a69 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -173,20 +173,28 @@ factory.addStep(ShellCommand(command=["runtask", '-i', {% if deployment_type == 'dev' %} -factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/')])) + +import datetime +from buildbot.process.properties import renderer + +@renderer +def today(props): + return datetime.datetime.now().strftime("%Y%m%d") + +artifactsdir = Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/%(kw:today)s', today=today) + +# create artifacts dir on master +factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', artifactsdir], + descriptionDone=['Create artifacs dir'])) # 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='%s/task_output' % artifactsdir)) # copy taskotron log to master -factory.addStep(FileUpload(slavesrc="/var/log/taskotron/taskotron.log", - masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'), +factory.addStep(FileUpload(slavesrc='/var/log/taskotron/taskotron.log', + masterdest='%s/taskotron.log' % artifactsdir, mode=0644)) - -# 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",