aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2017-04-06 05:02:12 +0000
committerJingLu5 <lvjing5@huawei.com>2017-04-06 05:02:12 +0000
commitd2cb7ce7331d8da4c3b5b70b09dac49cf65d1710 (patch)
treeb80af4a66e8d59ac49a766aa9902801772e4c68f
parent571ee6afca03120c393def421eb35a466f9a940b (diff)
pip install yardstick failed in Apex
JIRA: YARDSTICK-625 In Apex, yardstick uninstall and install via pip failed. This bug blocks yardstick CI jobs. This patch enables pip install yardstick in editable mode. So the install_yardstick() in yardstick_verify is unnecessary. Change-Id: If290dac5fee5584601064ae9753ae2340643d3ca Signed-off-by: JingLu5 <lvjing5@huawei.com>
-rwxr-xr-xinstall.sh2
-rwxr-xr-xtests/ci/load_images.sh2
-rwxr-xr-xtests/ci/yardstick-verify15
3 files changed, 1 insertions, 18 deletions
diff --git a/install.sh b/install.sh
index 75618dd27..25a4f5960 100755
--- a/install.sh
+++ b/install.sh
@@ -59,7 +59,7 @@ git config --global http.sslVerify false
# install yardstick + dependencies
easy_install -U pip
pip install -r requirements.txt
-pip install .
+pip install -e .
/bin/bash "$(pwd)/api/api-prepare.sh"
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 5557f814f..2e22b83c2 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -265,8 +265,6 @@ main()
for filename in tests/opnfv/test_cases/*; do
sed -i "s/cidr: '10.0.1.0\/24'/cidr: '10.3.1.0\/24'/g" "${filename}"
done
- # Update file changes
- pip install -U .
else
load_cirros_image
load_ubuntu_image
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 2986c9f2f..096ea534f 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -97,18 +97,6 @@ error_exit()
set -o errexit
set -o pipefail
-install_yardstick()
-{
- echo
- echo "========== Installing yardstick =========="
-
- # uninstall previous version
- pip uninstall -y yardstick || true
-
- # Install yardstick
- pip install .
-}
-
install_storperf()
{
# Install Storper on huawei-pod1
@@ -320,9 +308,6 @@ main()
echo " external network: $net"
done
- # install yardstick
- install_yardstick
-
source $YARDSTICK_REPO_DIR/tests/ci/clean_images.sh
trap "error_exit" EXIT SIGTERM