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

buildmaster: date dir should work now

Browse source
This commit is contained in:
Martin Krizek 2015-03-11 06:43:09 +00:00
parent dbeec354c2
commit 7e908bbb3a
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -185,7 +185,6 @@ factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifac
factory.addStep(FileUpload(slavesrc='/var/log/taskotron/taskotron.log', factory.addStep(FileUpload(slavesrc='/var/log/taskotron/taskotron.log',
masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'), masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'),
mode=0644)) mode=0644))
'''
import datetime import datetime
from buildbot.process.properties import renderer from buildbot.process.properties import renderer
@ -194,9 +193,8 @@ def today(props):
return datetime.datetime.now().strftime("%Y%m%d") return datetime.datetime.now().strftime("%Y%m%d")
# move artifacts dir # 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)], factory.addStep(MasterShellCommand(command=Interpolate('mkdir -p -m 0755 {{ public_artifacts_dir }}/%(kw:today)s && mv {{ public_artifacts_dir }}/%(prop:uuid)s/ {{ public_artifacts_dir }}/%(kw:today)s/', today=today),
descriptionDone=['Move artifacs dir'])) descriptionDone=['Move artifacs dir']))
'''
{% else %} {% else %}
# capture the taskotron log # capture the taskotron log
factory.addStep(ShellCommand(command=["cat", "/var/log/taskotron/taskotron.log"], name="cat_log", factory.addStep(ShellCommand(command=["cat", "/var/log/taskotron/taskotron.log"], name="cat_log",