opendev/base-jobs
Code Issues Proposed changes

Fix dynamic inventory in -src setup job

Browse Source 
Previously the -src job explicitly included the -keys then the -src
setup playbooks as separate pre-run playbooks. Unfortunately, this
doesn't work because we are only modifying the dynamic inventory in the
-keys playbooks. This doesn't carry over to a second playbook
instantiation for -src. Fix this by "reverting" back to using the old
pre.yaml playbook which imports both -keys and -src in one playbook
ensuring that the second playbook sees the updated dynamic inventory
that includes the bridge.

Change-Id: I947dae89ed3af2092a1e11171c5e90e9dcc8f3e3
This commit is contained in:
Clark Boylan 2025-02-25 14:12:48 -08:00
parent 25fdba83df
commit a2c59b50e1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zuul.d/jobs.yaml
View File

@ -572,6 +572,8 @@
nodeset:
nodes: []
# TODO(clean this base job up once we're using -src and -keys and running
# infra-prod jobs in parallel.
- job:
name: opendev-infra-prod-base
description: |
@ -588,9 +590,9 @@
This is not for general use.
abstract: true
pre-run:
- playbooks/infra-prod/setup-keys.yaml
- playbooks/infra-prod/setup-src.yaml
# pre.yaml includes setup keys which also dynamically adds the server
# to our inventory. Then runs source setup.
pre-run: playbooks/infra-prod/pre.yaml
- job:
name: opendev-infra-prod-setup-keys