Use local version of the include script

- Use local version of the include-raw-integration-install-robotframework.sh script
- correct name of pip python module

Fixed conflict in cherry pick:
- prepare-csit.sh

Issue-ID: POLICY-3092
Signed-off-by: arkadiusz.adamski <aadamski@est.tech>
Change-Id: Iba43621b3c8aebfa715cee91a75fd6832ccbc2be
(cherry picked from commit 8f44cb7dc7737433324083c0c307bf954d535200)
Signed-off-by: Jim Hahn <jrh3@att.com>

diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh
index 65b838b..8375e73 100644 (file)
--- 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 4297696..e154a12 100755 (executable)
--- a/csit/prepare-csit.sh
+++ b/csit/prepare-csit.sh
@@ -24,8 +24,7 @@ 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
@@ -33,11 +32,7 @@ fi
 if [ -f ${ROBOT_VENV}/bin/activate ]; then
     source ${ROBOT_VENV}/bin/activate
 else
-    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
+    source ./include-raw-integration-install-robotframework.sh
 fi