From 1a6a0aa35dc849f099981a5f4fba92219709f749 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Tue, 10 Mar 2015 13:28:38 +0000 Subject: [PATCH] buildmaster: disable date directory for a bit --- .../buildmaster-configure/templates/taskotron.master.cfg.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index 063e2817c0..d433f96554 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -185,7 +185,7 @@ 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'), mode=0644)) - +''' import datetime from buildbot.process.properties import renderer @@ -196,6 +196,7 @@ def today(props): # move artifacts dir factory.addStep(MasterShellCommand(command=["mkdir", '-p', '-m', '0755', Interpolate('{{ public_artifacts_dir }}/%(kw:today)s', today=today), '&&', 'mv', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/'), Interpolate('{{ public_artifacts_dir }}/%(kw:today)s/', today=today)], descriptionDone=['Move artifacs dir'])) +''' {% else %} # capture the taskotron log factory.addStep(ShellCommand(command=["cat", "/var/log/taskotron/taskotron.log"], name="cat_log",