From d281e8e2ccf917e972a119ec3ab800dcdaffe707 Mon Sep 17 00:00:00 2001 From: Marios Andreou Date: Wed, 12 Oct 2022 12:00:44 +0300 Subject: [PATCH] Adds zed into previous_release_from and fix master upgrades We added emit release support with [1] but forgot this case. It is the cause of related-bug. We also fix the master upgrade template since we now have zed as the previous release so replace wallaby with zed content provider in dependencies. [1] https://review.opendev.org/c/openstack/tripleo-ci/+/860586 Related-Bug: 1992560 Change-Id: I70a4ce03b950038dd0a9b383313bc7b505644329 --- roles/run-test/templates/oooq_common_functions.sh.j2 | 2 +- zuul.d/upgrades-jobs-templates.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/run-test/templates/oooq_common_functions.sh.j2 b/roles/run-test/templates/oooq_common_functions.sh.j2 index 3d8c14efc..fe0850006 100644 --- a/roles/run-test/templates/oooq_common_functions.sh.j2 +++ b/roles/run-test/templates/oooq_common_functions.sh.j2 @@ -19,7 +19,7 @@ function previous_release_mixed_upgrade_case { local release="${1:-master}" case "${release}" in ''|master|promotion-testing-hash-master) - echo "wallaby" + echo "zed" ;; wallaby|promotion-testing-hash-wallaby) echo "victoria" diff --git a/zuul.d/upgrades-jobs-templates.yaml b/zuul.d/upgrades-jobs-templates.yaml index 5525b478c..c02c6c174 100644 --- a/zuul.d/upgrades-jobs-templates.yaml +++ b/zuul.d/upgrades-jobs-templates.yaml @@ -7,7 +7,7 @@ check: jobs: - tripleo-ci-centos-9-content-provider - - tripleo-ci-centos-9-content-provider-wallaby + - tripleo-ci-centos-9-content-provider-zed - tripleo-ci-centos-9-scenario000-multinode-oooq-container-updates: &cs9_update_all irrelevant-files: &multinode_ignored - .*molecule.* @@ -106,7 +106,7 @@ - ^scripts/tripleo-unmount-image$ dependencies: - tripleo-ci-centos-9-content-provider - - tripleo-ci-centos-9-content-provider-wallaby + - tripleo-ci-centos-9-content-provider-zed gate: jobs: - tripleo-ci-centos-9-content-provider