From a2c59b50e143eff3139adf32a91e4f93c35810b5 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 25 Feb 2025 14:12:48 -0800 Subject: [PATCH] Fix dynamic inventory in -src setup job 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 --- zuul.d/jobs.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 69113b4..e9590a2 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -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