summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2019-10-05 13:11:20 +1300
committerLingxian Kong <anlin.kong@gmail.com>2019-10-10 21:55:53 +1300
commitd244c9d6661a4595533fcbb972798771791f4ed5 (patch)
tree45fb5a2db5e2a5a755dd9bf46ebae88a5325156a /devstack
parent650794eaf9f328bd1b2fc096992e6190a9d79c87 (diff)
downloadtrove-d244c9d6661a4595533fcbb972798771791f4ed5.tar.gz
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
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh7
1 files changed, 6 insertions, 1 deletions
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