summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghanshyam <gmann@ghanshyammann.com>2018-08-14 09:18:53 +0000
committerMatt Riedemann <mriedem.os@gmail.com>2018-09-06 19:09:28 +0000
commitbc9c5d5b4c2e9d004b620a6d9bd4add59e22d9a8 (patch)
tree1e67d4d290944accb16ab1357f141c9d2389001a
parentd2bd6faf5ecffbebe8eb721b7fb1bc366ca4bd9a (diff)
Update grenade settings for stable/rocky
Depends-On: https://review.openstack.org/600196/ Change-Id: I940a705d4b8269fbf3bec9f107f179e9191b5a42
Notes
Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+1: Sean McGinnis <sean.mcginnis@gmail.com> Code-Review+2: Jens Harbott (frickler) <j.harbott@x-ion.de> Workflow+1: Jens Harbott (frickler) <j.harbott@x-ion.de> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 07 Sep 2018 18:39:55 +0000 Reviewed-on: https://review.openstack.org/591594 Project: openstack-infra/devstack-gate Branch: refs/heads/master
-rwxr-xr-xdevstack-vm-gate-wrap.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 42bfb55..27e12d5 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -313,6 +313,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
313 export GRENADE_NEW_BRANCH="stable/queens" 313 export GRENADE_NEW_BRANCH="stable/queens"
314 elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then 314 elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
315 export GRENADE_OLD_BRANCH="stable/queens" 315 export GRENADE_OLD_BRANCH="stable/queens"
316 export GRENADE_NEW_BRANCH="stable/rocky"
317 elif [[ "$GRENADE_BASE_BRANCH" == "stable/rocky" ]]; then
318 export GRENADE_OLD_BRANCH="stable/rocky"
316 export GRENADE_NEW_BRANCH="$GIT_BRANCH" 319 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
317 fi 320 fi
318 ;; 321 ;;
@@ -338,8 +341,11 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
338 elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then 341 elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
339 export GRENADE_OLD_BRANCH="stable/pike" 342 export GRENADE_OLD_BRANCH="stable/pike"
340 export GRENADE_NEW_BRANCH="stable/queens" 343 export GRENADE_NEW_BRANCH="stable/queens"
341 else # master 344 elif [[ "$GRENADE_BASE_BRANCH" == "stable/rocky" ]]; then
342 export GRENADE_OLD_BRANCH="stable/queens" 345 export GRENADE_OLD_BRANCH="stable/queens"
346 export GRENADE_NEW_BRANCH="stable/rocky"
347 else # master
348 export GRENADE_OLD_BRANCH="stable/rocky"
343 export GRENADE_NEW_BRANCH="$GIT_BRANCH" 349 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
344 fi 350 fi
345 ;; 351 ;;