Browse Source

Merge "Update grenade settings for stable/rocky"

changes/07/601407/1
Zuul 8 months ago
parent
commit
95fa434310
1 changed files with 7 additions and 1 deletions
  1. 7
    1
      devstack-vm-gate-wrap.sh

+ 7
- 1
devstack-vm-gate-wrap.sh View File

@@ -310,6 +310,9 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
310 310
                 export GRENADE_NEW_BRANCH="stable/queens"
311 311
             elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
312 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 316
                 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
314 317
             fi
315 318
             ;;
@@ -335,8 +338,11 @@ if [[ -n "$DEVSTACK_GATE_GRENADE" ]]; then
335 338
             elif [[ "$GRENADE_BASE_BRANCH" == "stable/queens" ]]; then
336 339
                 export GRENADE_OLD_BRANCH="stable/pike"
337 340
                 export GRENADE_NEW_BRANCH="stable/queens"
338
-            else # master
341
+            elif [[ "$GRENADE_BASE_BRANCH" == "stable/rocky" ]]; then
339 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 346
                 export GRENADE_NEW_BRANCH="$GIT_BRANCH"
341 347
             fi
342 348
             ;;

Loading…
Cancel
Save