diff options
| author |   Matthew Watkins <mwatkins@linuxfoundation.org> | 2022-12-07 13:30:09 +0000 |
|---|---|---|
| committer | Matthew Watkins <mwatkins@linuxfoundation.org> | 2022-12-07 13:31:51 +0000 |
| commit | a52a51a6b09fc47b8fae4d603261c955de6f6069 (patch) | |
| tree | 05adb93236d02c5915787527e62c7ee2d4b438eb | |
| parent | 556e54f5905440e4c9c4fc7fbf9c027877e51517 (diff) | |
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
| -rwxr-xr-x | csit/prepare-csit.sh | 13 | ||||
| -rw-r--r-- | csit/pylibs.txt | 2 | ||||
| -rwxr-xr-x | csit/run-csit.sh | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh index b56c3855dd..67412f3cf3 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 d6250dbab5..4952616540 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 25f5f6a77a..6703160a37 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 |