Use the new infra-prod locking and dependency setup
We trigger some infra-prod deploy jobs from changes to project-config. We recently updated system-config to run jobs with new locking and depdendency setups and project-config needs to be updated to ensure everything works as expected on this side of the house. In particular normal infra-prod jobs no longer update repos on bridge. Instead infra-prod-bootstrap-bridge does this then pauses while holding a lock then pauses while the other infra-prod jobs in the buildset run. This ensures the jobs belonging to that buildset run with the correct git repo state and run with exclusivity compared to all other infra-prod deploy/periodic/opendev-prod-hourly buildsets. Change-Id: I64fc0fcc15e23bdc9b04eb23a75d77d576dc23bf
This commit is contained in:
@@ -481,25 +481,43 @@
|
|||||||
name: opendev/zone-gating.dev
|
name: opendev/zone-gating.dev
|
||||||
deploy:
|
deploy:
|
||||||
jobs:
|
jobs:
|
||||||
|
# This job configures the bridge node with the correct
|
||||||
|
# git repo state for system-config and project-config and then
|
||||||
|
# pauses while holding a lock to ensure exclusivity for the
|
||||||
|
# buildset.
|
||||||
|
- infra-prod-bootstrap-bridge
|
||||||
- infra-prod-service-nameserver:
|
- infra-prod-service-nameserver:
|
||||||
files: zones/.*
|
files: zones/.*
|
||||||
dependencies: []
|
dependencies:
|
||||||
|
- name: infra-prod-bootstrap-bridge
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
name: opendev/zone-opendev.org
|
name: opendev/zone-opendev.org
|
||||||
deploy:
|
deploy:
|
||||||
jobs:
|
jobs:
|
||||||
|
# This job configures the bridge node with the correct
|
||||||
|
# git repo state for system-config and project-config and then
|
||||||
|
# pauses while holding a lock to ensure exclusivity for the
|
||||||
|
# buildset.
|
||||||
|
- infra-prod-bootstrap-bridge
|
||||||
- infra-prod-service-nameserver:
|
- infra-prod-service-nameserver:
|
||||||
files: zones/.*
|
files: zones/.*
|
||||||
dependencies: []
|
dependencies:
|
||||||
|
- name: infra-prod-bootstrap-bridge
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
name: opendev/zone-zuul-ci.org
|
name: opendev/zone-zuul-ci.org
|
||||||
deploy:
|
deploy:
|
||||||
jobs:
|
jobs:
|
||||||
|
# This job configures the bridge node with the correct
|
||||||
|
# git repo state for system-config and project-config and then
|
||||||
|
# pauses while holding a lock to ensure exclusivity for the
|
||||||
|
# buildset.
|
||||||
|
- infra-prod-bootstrap-bridge
|
||||||
- infra-prod-service-nameserver:
|
- infra-prod-service-nameserver:
|
||||||
files: zones/.*
|
files: zones/.*
|
||||||
dependencies: []
|
dependencies:
|
||||||
|
- name: infra-prod-bootstrap-bridge
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
name: openinfra/groups
|
name: openinfra/groups
|
||||||
@@ -3527,30 +3545,41 @@
|
|||||||
files: *infra-docs-index
|
files: *infra-docs-index
|
||||||
- promote-openstack-specs-site:
|
- promote-openstack-specs-site:
|
||||||
files: *specs-site
|
files: *specs-site
|
||||||
|
# This job configures the bridge node with the correct
|
||||||
|
# git repo state for system-config and project-config and then
|
||||||
|
# pauses while holding a lock to ensure exclusivity for the
|
||||||
|
# buildset.
|
||||||
|
- infra-prod-bootstrap-bridge
|
||||||
- infra-prod-manage-projects:
|
- infra-prod-manage-projects:
|
||||||
dependencies: []
|
dependencies:
|
||||||
|
- name: infra-prod-bootstrap-bridge
|
||||||
files:
|
files:
|
||||||
- gerrit/.*
|
- gerrit/.*
|
||||||
- infra-prod-service-nodepool:
|
- infra-prod-service-nodepool:
|
||||||
dependencies: []
|
dependencies:
|
||||||
|
- name: infra-prod-bootstrap-bridge
|
||||||
files:
|
files:
|
||||||
- nodepool/.*
|
- nodepool/.*
|
||||||
- infra-prod-service-zuul:
|
- infra-prod-service-zuul:
|
||||||
dependencies:
|
dependencies:
|
||||||
|
- name: infra-prod-bootstrap-bridge
|
||||||
- name: infra-prod-manage-projects
|
- name: infra-prod-manage-projects
|
||||||
soft: true
|
soft: true
|
||||||
files:
|
files:
|
||||||
- zuul/main.yaml
|
- zuul/main.yaml
|
||||||
- infra-prod-run-accessbot:
|
- infra-prod-run-accessbot:
|
||||||
dependencies: []
|
dependencies:
|
||||||
|
- name: infra-prod-bootstrap-bridge
|
||||||
files:
|
files:
|
||||||
- accessbot/channels.yaml
|
- accessbot/channels.yaml
|
||||||
- infra-prod-service-eavesdrop:
|
- infra-prod-service-eavesdrop:
|
||||||
dependencies: []
|
dependencies:
|
||||||
|
- name: infra-prod-bootstrap-bridge
|
||||||
files:
|
files:
|
||||||
- gerritbot/channels.yaml
|
- gerritbot/channels.yaml
|
||||||
- infra-prod-service-grafana:
|
- infra-prod-service-grafana:
|
||||||
dependencies: []
|
dependencies:
|
||||||
|
- name: infra-prod-bootstrap-bridge
|
||||||
files: *project-config-grafana-files
|
files: *project-config-grafana-files
|
||||||
periodic:
|
periodic:
|
||||||
jobs:
|
jobs:
|
||||||
|
Reference in New Issue
Block a user