From 77f471be8bd681c7a4d41d0549104e231c437e95 Mon Sep 17 00:00:00 2001 From: JingLu5 Date: Thu, 6 Apr 2017 05:02:12 +0000 Subject: 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 (cherry picked from commit d2cb7ce7331d8da4c3b5b70b09dac49cf65d1710) --- install.sh | 2 +- tests/ci/load_images.sh | 2 -- tests/ci/yardstick-verify | 15 --------------- 3 files changed, 1 insertion(+), 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 87599100b..852144192 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 -- cgit 1.2.3-korg