Browse code

Merge "apparently the upstream naming is tempest-lib"

Jenkins authored on 2014/11/19 05:26:59
Showing 2 changed files
... ...
@@ -45,7 +45,7 @@ set +o xtrace
45 45
 # --------
46 46
 
47 47
 # Set up default directories
48
-GITDIR["tempest_lib"]=$DEST/tempest-lib
48
+GITDIR["tempest-lib"]=$DEST/tempest-lib
49 49
 
50 50
 TEMPEST_DIR=$DEST/tempest
51 51
 TEMPEST_CONFIG_DIR=${TEMPEST_CONFIG_DIR:-$TEMPEST_DIR/etc}
... ...
@@ -447,9 +447,9 @@ function create_tempest_accounts {
447 447
 
448 448
 # install_tempest_lib() - Collect source, prepare, and install tempest-lib
449 449
 function install_tempest_lib {
450
-    if use_library_from_git "tempest_lib"; then
451
-        git_clone_by_name "tempest_lib"
452
-        setup_develop "tempest_lib"
450
+    if use_library_from_git "tempest-lib"; then
451
+        git_clone_by_name "tempest-lib"
452
+        setup_develop "tempest-lib"
453 453
     fi
454 454
 }
455 455
 
... ...
@@ -203,8 +203,8 @@ TEMPEST_REPO=${TEMPEST_REPO:-${GIT_BASE}/openstack/tempest.git}
203 203
 TEMPEST_BRANCH=${TEMPEST_BRANCH:-master}
204 204
 
205 205
 # TODO(sdague): this should end up as a library component like below
206
-GITREPO["tempest_lib"]=${TEMPEST_LIB_REPO:-${GIT_BASE}/openstack/tempest-lib.git}
207
-GITBRANCH["tempest_lib"]=${TEMPEST_LIB_BRANCH:-master}
206
+GITREPO["tempest-lib"]=${TEMPEST_LIB_REPO:-${GIT_BASE}/openstack/tempest-lib.git}
207
+GITBRANCH["tempest-lib"]=${TEMPEST_LIB_BRANCH:-master}
208 208
 
209 209
 
210 210
 ##############