zuul-restart: change service order to prevent tenant loading failure

This change ensure the scheduler is restarted after the merger to
prevent issue when the merger are unable to process merge job
resulting in tenant loading failure.

Change-Id: Iea54213542ede75fdadab2d9896eca8e2e9aff93
This commit is contained in:
Tristan Cacqueray 2020-03-27 14:04:13 +00:00
parent bb0b0c984d
commit 71cdb23d27

View File

@ -11,12 +11,12 @@
scheduler.spec.template.metadata.labels.version != new_zuul_conf )
vars:
services:
- kind: StatefulSet
name: "{{ zuul_name }}-scheduler"
- kind: StatefulSet
name: "{{ zuul_name }}-executor"
- kind: Deployment
name: "{{ zuul_name }}-web"
- kind: StatefulSet
name: "{{ zuul_name }}-scheduler"
extra_services:
- kind: Deployment
name: "{{ zuul_name }}-merger"
@ -42,7 +42,7 @@
metadata:
labels:
version: "{{ new_zuul_conf }}"
loop: "{% if merger.count is defined and merger.count > 0 %}{{ services | union(extra_services) }}{% else %}{{ services }}{% endif %}"
loop: "{% if merger.count is defined and merger.count > 0 %}{{ extra_services | union(services) }}{% else %}{{ services }}{% endif %}"
- name: Reload pipeline queues
load_zuul_changes: