summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-09-07 18:39:55 +0000
committerGerrit Code Review <review@openstack.org>2018-09-07 18:39:55 +0000
commit95fa4343104eafa655375cce3546d27139211d13 (patch)
treec36a64703e6a4840d98963dfbf872a7194ae2268
parent87b3df316938d346feed6186465e6862c0a377eb (diff)
parentbc9c5d5b4c2e9d004b620a6d9bd4add59e22d9a8 (diff)
Merge "Update grenade settings for stable/rocky"
-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 2cecd5f..c34ae89 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -310,6 +310,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
310 export GRENADE_NEW_BRANCH="stable/queens" 310 export GRENADE_NEW_BRANCH="stable/queens"
311 elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then 311 elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
312 export GRENADE_OLD_BRANCH="stable/queens" 312 export GRENADE_OLD_BRANCH="stable/queens"
313 export GRENADE_NEW_BRANCH="stable/rocky"
314 elif [[ "$GRENADE_BASE_BRANCH" == "stable/rocky" ]]; then
315 export GRENADE_OLD_BRANCH="stable/rocky"
313 export GRENADE_NEW_BRANCH="$GIT_BRANCH" 316 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
314 fi 317 fi
315 ;; 318 ;;
@@ -335,8 +338,11 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
335 elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then 338 elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
336 export GRENADE_OLD_BRANCH="stable/pike" 339 export GRENADE_OLD_BRANCH="stable/pike"
337 export GRENADE_NEW_BRANCH="stable/queens" 340 export GRENADE_NEW_BRANCH="stable/queens"
338 else # master 341 elif [[ "$GRENADE_BASE_BRANCH" == "stable/rocky" ]]; then
339 export GRENADE_OLD_BRANCH="stable/queens" 342 export GRENADE_OLD_BRANCH="stable/queens"
343 export GRENADE_NEW_BRANCH="stable/rocky"
344 else # master
345 export GRENADE_OLD_BRANCH="stable/rocky"
340 export GRENADE_NEW_BRANCH="$GIT_BRANCH" 346 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
341 fi 347 fi
342 ;; 348 ;;