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>
(cherry picked from commit d2cb7ce7331d8da4c3b5b70b09dac49cf65d1710)

diff --git a/install.sh b/install.sh
index 75618dd..25a4f59 100755 (executable)
--- 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 8759910..8521441 100755 (executable)
--- 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 2986c9f..096ea53 100755 (executable)
--- 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