openstack/devstack
Code Issues Proposed changes

Merge "apparently the upstream naming is tempest-lib"

Browse Source
This commit is contained in:
Jenkins
2014-11-18 20:26:59 +00:00
committed by Gerrit Code Review
parent db0fa80c59 91b229058c
commit 51c20e7361
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/tempest
View File

@@ -45,7 +45,7 @@ set +o xtrace
# --------
# Set up default directories
GITDIR["tempest_lib"]=$DEST/tempest-lib
GITDIR["tempest-lib"]=$DEST/tempest-lib
TEMPEST_DIR=$DEST/tempest
TEMPEST_CONFIG_DIR=${TEMPEST_CONFIG_DIR:-$TEMPEST_DIR/etc}
@@ -447,9 +447,9 @@ function create_tempest_accounts {
# install_tempest_lib() - Collect source, prepare, and install tempest-lib
function install_tempest_lib {
if use_library_from_git "tempest_lib"; then
git_clone_by_name "tempest_lib"
setup_develop "tempest_lib"
if use_library_from_git "tempest-lib"; then
git_clone_by_name "tempest-lib"
setup_develop "tempest-lib"
fi
}

4
stackrc
View File

@@ -203,8 +203,8 @@ TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}
TEMPEST_BRANCH=${TEMPEST_BRANCH:-master}
# TODO(sdague): this should end up as a library component like below
GITREPO["tempest_lib"]=${TEMPEST_LIB_REPO:-${GIT_BASE}/openstack/tempest-lib.git}
GITBRANCH["tempest_lib"]=${TEMPEST_LIB_BRANCH:-master}
GITREPO["tempest-lib"]=${TEMPEST_LIB_REPO:-${GIT_BASE}/openstack/tempest-lib.git}
GITBRANCH["tempest-lib"]=${TEMPEST_LIB_BRANCH:-master}
##############