Skip to content

Commit

Permalink
Test against latest glance_store code
Browse files Browse the repository at this point in the history
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
  • Loading branch information
flaper87 committed Sep 9, 2014
1 parent 4bd4264 commit 4f78f8f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
6 changes: 6 additions & 0 deletions lib/glance
Expand Up @@ -28,6 +28,7 @@ set +o xtrace

# Set up default directories
GLANCE_DIR=$DEST/glance
GLANCE_STORE_DIR=$DEST/glance_store
GLANCECLIENT_DIR=$DEST/python-glanceclient
GLANCE_CACHE_DIR=${GLANCE_CACHE_DIR:=$DATA_DIR/glance/cache}
GLANCE_IMAGE_DIR=${GLANCE_IMAGE_DIR:=$DATA_DIR/glance/images}
Expand Down Expand Up @@ -252,6 +253,11 @@ function install_glanceclient {

# install_glance() - Collect source and prepare
function install_glance {
# Install glance_store from git so we make sure we're testing
# the latest code.
git_clone $GLANCE_STORE_REPO $GLANCE_STORE_DIR $GLANCE_STORE_BRANCH
setup_develop $GLANCE_STORE_DIR

git_clone $GLANCE_REPO $GLANCE_DIR $GLANCE_BRANCH
setup_develop $GLANCE_DIR
}
Expand Down
3 changes: 3 additions & 0 deletions stackrc
Expand Up @@ -144,6 +144,9 @@ DIB_BRANCH=${DIB_BRANCH:-master}
GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}
GLANCE_BRANCH=${GLANCE_BRANCH:-master}

GLANCE_STORE_REPO=${GLANCE_STORE_REPO:-${GIT_BASE}/openstack/glance_store.git}
GLANCE_STORE_BRANCH=${GLANCE_STORE_BRANCH:-master}

# python glance client library
GLANCECLIENT_REPO=${GLANCECLIENT_REPO:-${GIT_BASE}/openstack/python-glanceclient.git}
GLANCECLIENT_BRANCH=${GLANCECLIENT_BRANCH:-master}
Expand Down

0 comments on commit 4f78f8f

Please sign in to comment.