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

taskotron-buildmaster: send TERM signal before KILL

Browse source 
Also follow heartbeat.log.
This commit is contained in:
Kamil Páral 2018-01-24 13:36:39 +01:00
parent 858fcf681b
commit 8f2dd30ae2
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -214,18 +214,24 @@ factory.addStep(ShellCommand(command=["runtask",
{% endif %} {% endif %}
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=20*60,
{% if deployment_type in ['dev', 'stg', 'prod'] %} {% if deployment_type in ['dev'] %}
sigtermTime=5*60,
logfiles={
'heartbeat.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/tests.yml/taskotron/heartbeat.log')} # FIXME: tests.yml hardcoded
}
{% endif %}
{% if deployment_type in ['stg', 'prod'] %}
logfiles={ logfiles={
'taskotron-overlord.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-overlord.log')}, 'taskotron-overlord.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron-overlord.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')},
'taskotron.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron.log')} 'taskotron.log': {'filename': Interpolate('/var/lib/taskotron/artifacts/%(prop:uuid)s/taskotron.log')}
} }
))
{% endif %} {% endif %}
{% if deployment_type in ['local'] %} {% if deployment_type in ['local'] %}
logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }})) logfiles={'taskotron.log': {'filename': '/var/log/taskotron/taskotron.log', }}
{% endif %} {% endif %}
))
factory.addStep(ShellCommand(command=Interpolate('testcloud instance remove --force taskotron-%(prop:uuid)s; true'), factory.addStep(ShellCommand(command=Interpolate('testcloud instance remove --force taskotron-%(prop:uuid)s; true'),