aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--csit/include-raw-integration-install-robotframework.sh4
-rwxr-xr-xcsit/prepare-csit.sh11
2 files changed, 5 insertions, 10 deletions
diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh
index 65b838b1..8375e736 100644
--- a/csit/include-raw-integration-install-robotframework.sh
+++ b/csit/include-raw-integration-install-robotframework.sh
@@ -26,9 +26,9 @@ source "${ROBOT_VENV}/bin/activate"
set -exu
# Make sure pip3 itself us up-to-date.
-python3 -m pip3 install --upgrade pip3
+python3 -m pip install --upgrade pip
echo "Installing Python Requirements"
-python3 -m pip3 install -r pylibs.txt
+python3 -m pip install -r pylibs.txt
odltools -V
pip3 freeze
diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh
index d9c6f55c..e154a12b 100755
--- a/csit/prepare-csit.sh
+++ b/csit/prepare-csit.sh
@@ -24,20 +24,15 @@ if [ -z "$WORKSPACE" ]; then
fi
# Assume that if ROBOT_VENV is set and virtualenv with system site packages can be activated,
-# ci-management/jjb/integration/include-raw-integration-install-robotframework.sh has already
-# been executed
+# include-raw-integration-install-robotframework.sh has already been executed
if [ -f ${WORKSPACE}/env.properties ]; then
source ${WORKSPACE}/env.properties
fi
if [ -f ${ROBOT_VENV}/bin/activate ]; then
source ${ROBOT_VENV}/bin/activate
-elif [ ! -d /tmp/ci-management ]; then
- rm -rf /tmp/ci-management
- rm -f ${WORKSPACE}/env.properties
- cd /tmp
- git clone -b master --single-branch https://github.com/onap/ci-management.git
- source /tmp/ci-management/jjb/integration/include-raw-integration-install-robotframework.sh
+else
+ source ./include-raw-integration-install-robotframework.sh
fi