From d244c9d6661a4595533fcbb972798771791f4ed5 Mon Sep 17 00:00:00 2001
From: Lingxian Kong <anlin.kong@gmail.com>
Date: Sat, 5 Oct 2019 13:11:20 +1300
Subject: Support to specify branch when building the image

- Explicity specify branch name for building non-dev image
- Use branch name for building dev image in devstack
- Update the doc

Candidate backport for stable/train

Change-Id: I4d2fe38fac34c75b42234fa7a20aba51e6dc1c4e
---
 devstack/plugin.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'devstack')

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index f5ee71ec..a2a88a7e 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -447,7 +447,12 @@ function create_guest_image {
 
     echo "Starting to create guest image..."
 
-    $DEST/trove/integration/scripts/trovestack build-image ${TROVE_DATASTORE_TYPE} ${TROVE_IMAGE_OS} ${TROVE_IMAGE_OS_RELEASE} true
+    TROVE_BRANCH=${TROVE_BRANCH} $DEST/trove/integration/scripts/trovestack \
+      build-image \
+      ${TROVE_DATASTORE_TYPE} \
+      ${TROVE_IMAGE_OS} \
+      ${TROVE_IMAGE_OS_RELEASE} \
+      true
 
     image_name="trove-${TROVE_IMAGE_OS}-${TROVE_IMAGE_OS_RELEASE}-${TROVE_DATASTORE_TYPE}"
     image_file=$HOME/images/${image_name}.qcow2
-- 
cgit v1.2.1