Skip to content

Commit 4f78f8f

Browse files
committed
Test against latest glance_store code
Install glance_store from git so we can test Glance against master. This is useful for both, glance and glance_store gates, to make sure nothing is broken there. Change-Id: I6c01165c4384c41f46f2c32d64475703b3178dab
1 parent 4bd4264 commit 4f78f8f

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

lib/glance

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ set +o xtrace
2828

2929
# Set up default directories
3030
GLANCE_DIR=$DEST/glance
31+
GLANCE_STORE_DIR=$DEST/glance_store
3132
GLANCECLIENT_DIR=$DEST/python-glanceclient
3233
GLANCE_CACHE_DIR=${GLANCE_CACHE_DIR:=$DATA_DIR/glance/cache}
3334
GLANCE_IMAGE_DIR=${GLANCE_IMAGE_DIR:=$DATA_DIR/glance/images}
@@ -252,6 +253,11 @@ function install_glanceclient {
252253

253254
# install_glance() - Collect source and prepare
254255
function install_glance {
256+
# Install glance_store from git so we make sure we're testing
257+
# the latest code.
258+
git_clone $GLANCE_STORE_REPO $GLANCE_STORE_DIR $GLANCE_STORE_BRANCH
259+
setup_develop $GLANCE_STORE_DIR
260+
255261
git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
256262
setup_develop $GLANCE_DIR
257263
}

stackrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ DIB_BRANCH=${DIB_BRANCH:-master}
144144
GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}
145145
GLANCE_BRANCH=${GLANCE_BRANCH:-master}
146146

147+
GLANCE_STORE_REPO=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git}
148+
GLANCE_STORE_BRANCH=${GLANCE_STORE_BRANCH:-master}
149+
147150
# python glance client library
148151
GLANCECLIENT_REPO=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}
149152
GLANCECLIENT_BRANCH=${GLANCECLIENT_BRANCH:-master}

0 commit comments

Comments
 (0)