Browse code

Merge "Stop installing tempest"

Jenkins authored on 2015/02/10 08:15:16
Showing 1 changed files
... ...
@@ -95,7 +95,8 @@ function remove_disabled_extensions {
95 95
 
96 96
 # configure_tempest() - Set config files, create data dirs, etc
97 97
 function configure_tempest {
98
-    setup_develop $TEMPEST_DIR
98
+    # install testr since its used to process tempest logs
99
+    pip_install `grep -h testrepository $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1`
99 100
     local image_lines
100 101
     local images
101 102
     local num_images
... ...
@@ -319,7 +320,8 @@ function configure_tempest {
319 319
     # Run verify_tempest_config -ur to retrieve enabled extensions on API endpoints
320 320
     # NOTE(mtreinish): This must be done after auth settings are added to the tempest config
321 321
     local tmp_cfg_file=$(mktemp)
322
-    $TEMPEST_DIR/tempest/cmd/verify_tempest_config.py -uro $tmp_cfg_file
322
+    cd $TEMPEST_DIR
323
+    tox -evenv -- verify-tempest-config -uro $tmp_cfg_file
323 324
 
324 325
     local compute_api_extensions=${COMPUTE_API_EXTENSIONS:-"all"}
325 326
     if [[ ! -z "$DISABLE_COMPUTE_API_EXTENSIONS" ]]; then