Fix CSITs in istanbul release

The problem with installing the robot framework is also in this release.

Issue-ID: POLICY-4350
Change-Id: I4c2d991eb41ddaa89280fc32b1c0d03c9ab3b0ff
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh
index 1fb107b..22f71a7 100755 (executable)
--- a/csit/include-raw-integration-install-robotframework.sh
+++ b/csit/include-raw-integration-install-robotframework.sh
@@ -2,7 +2,7 @@
 #
 # ============LICENSE_START===================================================
 # Copyright (c) 2016 The Linux Foundation and others.
-# Modification Copyright 2021. Nordix Foundation.
+# Modification Copyright 2021-2022 Nordix Foundation.
 # Modification Copyright 2021 AT&T Intellectual Property. All rights reserved.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 # ============LICENSE_END=====================================================
 #
 
-ROBOT_VENV=$(mktemp -d --suffix=robot_venv)
+ROBOT_VENV=$(mktemp -d)
 echo "ROBOT_VENV=${ROBOT_VENV}" >> "${WORKSPACE}/env.properties"
 
 echo "Python version is: $(python3 --version)"
@@ -33,5 +33,5 @@ set -exu
 python3 -m pip install --upgrade pip
 
 echo "Installing Python Requirements"
-python3 -m pip install -r pylibs.txt
+python3 -m pip install -r ${SCRIPTS}/pylibs.txt
 python3 -m pip freeze

diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh
index 9625c48..b51e0a1 100755 (executable)
--- a/csit/prepare-csit.sh
+++ b/csit/prepare-csit.sh
@@ -2,7 +2,7 @@
 #
 # Copyright 2019 © Samsung Electronics Co., Ltd.
 # Modification Copyright 2021 © AT&T Intellectual Property.
-# Modification Copyright 2021. Nordix Foundation.
+# Modification Copyright 2021-2022 Nordix Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,25 +20,25 @@
 #
 
 if [ -z "$WORKSPACE" ]; then
-    export WORKSPACE=`git rev-parse --show-toplevel`
+    export WORKSPACE=$(git rev-parse --show-toplevel)
 fi
 
 # Assume that if ROBOT_VENV is set and virtualenv with system site packages can be activated,
 # include-raw-integration-install-robotframework.sh has already been executed
 
-if [ -f ${WORKSPACE}/env.properties ]; then
-    source ${WORKSPACE}/env.properties
+if [ -f "${WORKSPACE}"/env.properties ]; then
+    source "${WORKSPACE}"/env.properties
 fi
-if [ -f ${ROBOT_VENV}/bin/activate ]; then
-    source ${ROBOT_VENV}/bin/activate
+if [ -f "${ROBOT_VENV}"/bin/activate ]; then
+    source "${ROBOT_VENV}"/bin/activate
 else
-    source ./include-raw-integration-install-robotframework.sh
+    source ${SCRIPTS}/include-raw-integration-install-robotframework.sh
 fi
 
 
 # install eteutils
-mkdir -p ${ROBOT_VENV}/src/onap
-rm -rf ${ROBOT_VENV}/src/onap/testsuite
+mkdir -p "${ROBOT_VENV}"/src/onap
+rm -rf "${ROBOT_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
 
 python3 -m pip freeze