From 17cbd7b1b51f8d961ad6a908d12c767497afceb9 Mon Sep 17 00:00:00 2001
From: Matthew Watkins <mwatkins@linuxfoundation.org>
Date: Thu, 17 Nov 2022 16:39:39 -0800
Subject: [PATCH] Fix: Swap prepare-csit.sh to Python3 robot framework

Issue-ID: RELENG-4523
Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
Change-Id: I246f9f76996943826afc7d05796e6ddc5c0de6dc
---
 csit/prepare-csit.sh | 20 ++++++++++----------
 csit/run-csit.sh     |  4 +++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh
index c40f4c1bf..b56c3855d 100755
--- a/csit/prepare-csit.sh
+++ b/csit/prepare-csit.sh
@@ -26,25 +26,25 @@ fi
 
 TESTPLANDIR=${WORKSPACE}/${TESTPLAN}
 
-# Assume that if ROBOT_VENV is set and virtualenv with system site packages can be activated,
+# Assume that if ROBOT3_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
 
 if [ -f ${WORKSPACE}/env.properties ]; then
     source ${WORKSPACE}/env.properties
 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
-    source ${WORKSPACE}/install-robotframework.sh
+if [ -f ${ROBOT3_VENV}/bin/activate ]; then
+   source ${ROBOT3_VENV}/bin/activate
+#else
+#    rm -rf /tmp/ci-management
+#    rm -f ${WORKSPACE}/env.properties
+#    cd /tmp
+#    source ${WORKSPACE}/install-robotframework.sh
 fi
 
 # install eteutils
-mkdir -p ${ROBOT_VENV}/src/onap
-rm -rf ${ROBOT_VENV}/src/onap/testsuite
+mkdir -p ${ROBOT3_VENV}/src/onap
+rm -rf ${ROBOT3_VENV}/src/onap/testsuite
 python3 -m pip install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.5.1.*' --pre
 
 pip freeze
diff --git a/csit/run-csit.sh b/csit/run-csit.sh
index f291e3418..aefcc8539 100755
--- a/csit/run-csit.sh
+++ b/csit/run-csit.sh
@@ -24,7 +24,6 @@
 source_safely "${ROBOT3_VENV}/bin/activate"
 
 WORKDIR=$(mktemp -d --suffix=-robot-workdir)
-cd "${WORKDIR}"
 
 #
 # functions
@@ -160,6 +159,9 @@ TESTPLANDIR="${WORKSPACE}/${TESTPLAN}"
 # Run installation of prerequired libraries
 source_safely "${WORKSPACE}/prepare-csit.sh"
 
+# Use robot framework working directory
+cd "${WORKDIR}"
+
 # Add csit scripts to PATH
 export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT3_VENV}/bin"
 export SCRIPTS="${WORKSPACE}/scripts"
-- 
2.16.6