aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/bash
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-12-13 12:49:21 +0000
committerJan Gelety <jgelety@cisco.com>2019-12-16 11:12:45 +0000
commit3111f250640b2f0364bd62104416ada41098b280 (patch)
tree16c25a3875c720eab90e20832fa154b2a72d9d66 /resources/libraries/bash
parentdee46d5cedf38248eaf6a54dd273e93a592007b0 (diff)
FIX PIP requirement packages
+ CSIT will only use packages installed from master PIP requirement.txt file + All CSIT subsequent code must use single function and PIP list for virtualenv - Report/PAL/doc/trending will follow in next patch Change-Id: Ia9150fb05a144182a5a163178d553370ede55cdd Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/bash')
-rw-r--r--resources/libraries/bash/function/common.sh2
-rw-r--r--resources/libraries/bash/function/per_patch.sh4
2 files changed, 1 insertions, 5 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index f3e86164e1..eb7cee970e 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -119,7 +119,7 @@ function activate_virtualenv () {
pip3 install --upgrade virtualenv || {
die "Virtualenv package install failed."
}
- virtualenv -p $(which python3) "${env_dir}" || {
+ virtualenv --python=$(which python3) "${env_dir}" || {
die "Virtualenv creation for $(which python3) failed."
}
set +u
diff --git a/resources/libraries/bash/function/per_patch.sh b/resources/libraries/bash/function/per_patch.sh
index ea7ea4f837..abf2cac688 100644
--- a/resources/libraries/bash/function/per_patch.sh
+++ b/resources/libraries/bash/function/per_patch.sh
@@ -108,10 +108,6 @@ function compare_test_results () {
set -exuo pipefail
cd "${VPP_DIR}" || die "Change directory operation failed."
- # Ply is installed as system level package, but not seen for some reason.
- pip3 install -r "${PYTHON_SCRIPTS_DIR}/perpatch_requirements.txt" || {
- die "Compare script Python requirements installation failed."
- }
# Reusing CSIT main virtualenv.
python3 "${TOOLS_DIR}/integrated/compare_perpatch.py"
# The exit code determines the vote result.