From 1368b98669ae9365193f8cd22bdce1c9abdc5499 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Wed, 4 Feb 2015 15:28:18 -0800 Subject: [PATCH] Stop installing tempest We run tempest inside of tox so no nee to install it. By not installing it we decouple one more thing from the requirements sync. Without this patch, due to branchless tempest, tempest must work with master and all stable branch global requirements. Although installing tempest should work on master, don't install it anyway to make the user experience more uniform across master and stable branches. Note: Long term we can install this inside of a virtualenv (I92648fffc1ad6af53006a0970722fd15f4e79dc2) but that logic hasn't landed yet and installing tempest is breaking us. So leave moving this to a virtualenv for a later patch. Change-Id: I78d51f04ed01da4ce8aa0e127be028f969d3b4f8 --- lib/tempest | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/tempest b/lib/tempest index 1ae945779d..e416affc46 100644 --- a/lib/tempest +++ b/lib/tempest @@ -95,7 +95,8 @@ function remove_disabled_extensions { # configure_tempest() - Set config files, create data dirs, etc function configure_tempest { - setup_develop $TEMPEST_DIR + # install testr since its used to process tempest logs + pip_install `grep -h testrepository $REQUIREMENTS_DIR/global-requirements.txt | cut -d\# -f1` local image_lines local images local num_images @@ -319,7 +320,8 @@ function configure_tempest { # Run verify_tempest_config -ur to retrieve enabled extensions on API endpoints # NOTE(mtreinish): This must be done after auth settings are added to the tempest config local tmp_cfg_file=$(mktemp) - $TEMPEST_DIR/tempest/cmd/verify_tempest_config.py -uro $tmp_cfg_file + cd $TEMPEST_DIR + tox -evenv -- verify-tempest-config -uro $tmp_cfg_file local compute_api_extensions=${COMPUTE_API_EXTENSIONS:-"all"} if [[ ! -z "$DISABLE_COMPUTE_API_EXTENSIONS" ]]; then