Merge "Update grenade setting for stable/wallaby"

This commit is contained in:
Zuul 2021-04-13 06:27:35 +00:00 committed by Gerrit Code Review
commit 913dd53cd9
1 changed files with 7 additions and 1 deletions

View File

@ -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
;;