From: Matthew Watkins <mwatkins@linuxfoundation.org>
Date: Wed, 7 Dec 2022 13:30:09 +0000 (+0000)
Subject: Chore: Re-instate robotframework-requests==0.9.3
X-Git-Tag: 3.2.1~51^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a52a51a6b09fc47b8fae4d603261c955de6f6069;p=cps.git

Chore: Re-instate robotframework-requests==0.9.3

Need to re-instate a pinned version for the Python test suite.
Also we can add back the backup installation method from the script
in ci-management.

Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
Change-Id: If0ec07edb1c156b06a9c2621a4e22bd35b9240a9
---

diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh
index b56c3855d..67412f3cf 100755
--- a/csit/prepare-csit.sh
+++ b/csit/prepare-csit.sh
@@ -20,6 +20,8 @@
 # Branched from ccsdk/distribution to this repository Feb 23, 2021
 #
 
+echo "---> prepare-csit.sh"
+
 if [ -z "$WORKSPACE" ]; then
     export WORKSPACE=`git rev-parse --show-toplevel`
 fi
@@ -35,11 +37,12 @@ if [ -f ${WORKSPACE}/env.properties ]; then
 fi
 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
+else
+    rm -rf /tmp/ci-management
+    rm -f ${WORKSPACE}/env.properties
+    cd /tmp
+    git clone "https://gerrit.onap.org/r/ci-management"
+    source /tmp/ci-management/jjb/integration/include-raw-integration-install-robotframework-py3.sh
 fi
 
 # install eteutils
diff --git a/csit/pylibs.txt b/csit/pylibs.txt
index d6250dbab..495261654 100644
--- a/csit/pylibs.txt
+++ b/csit/pylibs.txt
@@ -5,7 +5,7 @@ netifaces
 pyhocon
 requests
 robotframework-httplibrary
-robotframework-requests
+robotframework-requests==0.9.3
 robotframework-selenium2library
 robotframework-extendedselenium2library
 robotframework-sshlibrary
diff --git a/csit/run-csit.sh b/csit/run-csit.sh
index 25f5f6a77..6703160a3 100755
--- a/csit/run-csit.sh
+++ b/csit/run-csit.sh
@@ -26,6 +26,8 @@ WORKDIR=$(mktemp -d --suffix=-robot-workdir)
 # functions
 #
 
+echo "---> run-csit.sh"
+
 # wrapper for sourcing a file
 function source_safely() {
     [ -z "$1" ] && return 1