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

buildmaster: revert using date directory for artifacts

Browse source
This commit is contained in:
Martin Krizek 2015-03-10 07:20:00 +00:00
parent 1f95cc2e1b
commit 603222e7ff
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,27 +173,17 @@ factory.addStep(ShellCommand(command=["runtask", '-i',
{% if deployment_type == 'dev' %} {% if deployment_type == 'dev' %}
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 }}/%(kw:today)s/%(prop:uuid)s', today=today)
# create artifacts dir on master # create artifacts dir on master
factory.addStep(MasterShellCommand(command=["mkdir", '-p', '-m', '0755', artifactsdir], factory.addStep(MasterShellCommand(command=["mkdir", '-m', '0755', Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s')],
descriptionDone=['Create artifacs dir'])) descriptionDone=['Create artifacs dir']))
# copy artifacts to master # copy artifacts to master
factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/'), factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/'),
masterdest='%s/task_output' % artifactsdir)) masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output')))
# copy taskotron log to master # copy taskotron log to master
factory.addStep(FileUpload(slavesrc='/var/log/taskotron/taskotron.log', factory.addStep(FileUpload(slavesrc='/var/log/taskotron/taskotron.log',
masterdest='%s/taskotron.log' % artifactsdir, masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'),
mode=0644)) mode=0644))
{% else %} {% else %}
# capture the taskotron log # capture the taskotron log