From ccdfff263e54a54ce04c676e8d8cc18b56ac655e Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Tue, 6 Apr 2021 11:08:38 -0500 Subject: [PATCH] Update grenade setting for stable/wallaby There are still grenade legacy jobs in few projects, so for them we need to update the grenade setting in d-g. Hope this is last release we need to support in d-g. Depends-On: https://review.opendev.org/c/openstack/devstack/+/784974 Change-Id: I5f98212be14ac3ebad961595e60a099c58fedada --- devstack-vm-gate-wrap.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index a38da1db..42b39878 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -331,6 +331,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then export GRENADE_NEW_BRANCH="stable/victoria" elif [[ "$GRENADE_BASE_BRANCH" == "stable/victoria" ]]; then export GRENADE_OLD_BRANCH="stable/victoria" + export GRENADE_NEW_BRANCH="stable/wallaby" + elif [[ "$GRENADE_BASE_BRANCH" == "stable/wallaby" ]]; then + export GRENADE_OLD_BRANCH="stable/wallaby" export GRENADE_NEW_BRANCH="$GIT_BRANCH" fi ;; @@ -371,8 +374,11 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then elif [[ "$GRENADE_BASE_BRANCH" == "stable/victoria" ]]; then export GRENADE_OLD_BRANCH="stable/ussuri" export GRENADE_NEW_BRANCH="stable/victoria" - else # master + elif [[ "$GRENADE_BASE_BRANCH" == "stable/wallaby" ]]; then export GRENADE_OLD_BRANCH="stable/victoria" + export GRENADE_NEW_BRANCH="stable/wallaby" + else # master + export GRENADE_OLD_BRANCH="stable/wallaby" export GRENADE_NEW_BRANCH="$GIT_BRANCH" fi ;;