Fix CSITs in jakarta release

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

Issue-ID: POLICY-4350
Change-Id: Iae25d4033e041a716f54583ef161b14daf4be4d1
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 4a6f3db..b51e0a1 100755 (executable)
--- a/csit/prepare-csit.sh
+++ b/csit/prepare-csit.sh
@@ -32,7 +32,7 @@ fi
 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