summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2022-09-07 09:16:11 +0100
committerliamfallon <liam.fallon@est.tech>2022-09-07 09:48:46 +0100
commit5046df6113b9b1e8eecac5ad5cab88902ca6f312 (patch)
tree6ae2f5f4fea24e3f28db190e3eadfe72e07f283e
parentfaac45b578a29078700b5ea003c69cedc1a17b5f (diff)
Ensure robot framework is installed for CSITs
The script to install the robot framework for CSITs was not called due to an incorrect path in its invocation. This commit ensures it is called. This bug has been in the CSIT scripts for a numebr of releases. It only seems to have become an issue in the last few hours. Issue-ID: POLICY-4338 Change-Id: I0c2c578b784732a4f2beed514512f8e8c558f726 Signed-off-by: liamfallon <liam.fallon@est.tech>
-rwxr-xr-xcsit/include-raw-integration-install-robotframework.sh4
-rwxr-xr-xcsit/prepare-csit.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/csit/include-raw-integration-install-robotframework.sh b/csit/include-raw-integration-install-robotframework.sh
index 1fb107b6..2711d18e 100755
--- a/csit/include-raw-integration-install-robotframework.sh
+++ b/csit/include-raw-integration-install-robotframework.sh
@@ -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 4a6f3db6..b51e0a13 100755
--- 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