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

adjusting taskotron master template so stg works with disposable clients

Browse source
This commit is contained in:
Tim Flink 2016-01-21 00:12:04 +00:00
parent 57f64817f9
commit 3f904f1669
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,7 +151,7 @@ from buildbot.steps.master import MasterShellCommand
factory = BuildFactory() factory = BuildFactory()
{% if deployment_type in ['prod', 'stg', 'local'] %} {% if deployment_type in ['prod', 'local'] %}
# clean out /var/tmp/taskotron (see T253) # clean out /var/tmp/taskotron (see T253)
factory.addStep(ShellCommand(command="rm -rf /var/tmp/taskotron/*", name="rm_tmp", descriptionDone=['Clean tmp'])) factory.addStep(ShellCommand(command="rm -rf /var/tmp/taskotron/*", name="rm_tmp", descriptionDone=['Clean tmp']))
@ -159,7 +159,7 @@ factory.addStep(ShellCommand(command="rm -rf /var/tmp/taskotron/*", name="rm_tmp
factory.addStep(ShellCommand(command=["rm", "-f", "/var/log/taskotron/taskotron.log"], name="rm_log", descriptionDone=['Clean log'])) factory.addStep(ShellCommand(command=["rm", "-f", "/var/log/taskotron/taskotron.log"], name="rm_log", descriptionDone=['Clean log']))
{% endif %} {% endif %}
{% if deployment_type == 'dev' %} {% if deployment_type in ['dev', 'stg'] %}
# clean out /var/tmp/taskotron (see T253) # clean out /var/tmp/taskotron (see T253)
factory.addStep(ShellCommand(command=Interpolate("rm -rf /var/tmp/taskotron/%(prop:slavename)s/*"), name="rm_tmp", descriptionDone=['Clean tmp'])) factory.addStep(ShellCommand(command=Interpolate("rm -rf /var/tmp/taskotron/%(prop:slavename)s/*"), name="rm_tmp", descriptionDone=['Clean tmp']))
{% endif %} {% endif %}
@ -179,7 +179,7 @@ factory.addStep(ShellCommand(command=["runtask",
descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')], descriptionDone=[Interpolate('%(prop:taskname)s on %(prop:item)s')],
name='runtask', name='runtask',
timeout=2400, timeout=2400,
{% if deployment_type == 'dev' %} {% if deployment_type in ['dev', 'stg'] %}
logfiles={ logfiles={
'taskotron-initiator.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-initiator.log')}, 'taskotron-initiator.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-initiator.log')},
'taskotron-stdio.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-stdio.log')}, 'taskotron-stdio.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-stdio.log')},
@ -187,7 +187,7 @@ factory.addStep(ShellCommand(command=["runtask",
} }
)) ))
{% endif %} {% endif %}
{% if deployment_type in ['prod', 'stg', 'local'] %} {% if deployment_type in ['prod', 'local'] %}
logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }})) logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }}))
{% endif %} {% endif %}
@ -200,7 +200,7 @@ factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifac
masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output'))) masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output')))
{% if deployment_type in ['prod', 'stg', 'local'] %} {% if deployment_type in ['prod', 'local'] %}
# 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=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'), masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/taskotron.log'),
@ -403,7 +403,7 @@ c['db'] = {
# This specifies what database buildbot uses to store its state. You can leave # This specifies what database buildbot uses to store its state. You can leave
# this at its default for all but the largest installations. # this at its default for all but the largest installations.
{% if deployment_type == 'dev' %} {% if deployment_type == 'dev' %}
'db_url' : "postgresql://{{ dev_buildmaster_db_user }}:{{ dev_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}", 'db_url' : "postgresql://{{ buildmaster_db_user }}:{{ buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",
{% endif %} {% endif %}
{% if deployment_type == 'stg' %} {% if deployment_type == 'stg' %}
'db_url' : "postgresql://{{ stg_buildmaster_db_user }}:{{ stg_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}", 'db_url' : "postgresql://{{ stg_buildmaster_db_user }}:{{ stg_buildmaster_db_password }}@{{ buildmaster_db_host }}/{{ buildmaster_db_name }}",