diff options
| -rwxr-xr-x | csit/prepare-csit.sh | 12 | ||||
| -rwxr-xr-x | csit/run-csit.sh | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh index 163698d6..88c99fc7 100755 --- a/csit/prepare-csit.sh +++ b/csit/prepare-csit.sh @@ -20,21 +20,23 @@ # Branched from integration/csit to this repository 18.2.2021 # +echo "---> prepare-csit.sh" + if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi TESTPLANDIR=${WORKSPACE}/${TESTPLAN} -# Assume that if ROBOT_VENV is set and virtualenv with system site packages can be activated, +# Assume that if ROBOT3_VENV is set and virtualenv with system site packages can be activated, # ci-management/jjb/integration/include-raw-integration-install-robotframework.sh has already # been executed 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 ${ROBOT3_VENV}/bin/activate ]; then + source ${ROBOT3_VENV}/bin/activate else rm -rf /tmp/ci-management rm -f ${WORKSPACE}/env.properties @@ -44,8 +46,8 @@ else fi # install eteutils -mkdir -p ${ROBOT_VENV}/src/onap -rm -rf ${ROBOT_VENV}/src/onap/testsuite +mkdir -p ${ROBOT3_VENV}/src/onap +rm -rf ${ROBOT3_VENV}/src/onap/testsuite pip install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.5.1.*' --pre pip freeze diff --git a/csit/run-csit.sh b/csit/run-csit.sh index e23e84a3..6a073e50 100755 --- a/csit/run-csit.sh +++ b/csit/run-csit.sh @@ -25,6 +25,8 @@ # functions # +echo "---> run-csit.sh" + function on_exit(){ rc=$? if [[ ${WORKSPACE} ]]; then @@ -156,13 +158,13 @@ TESTPLANDIR="${WORKSPACE}/${TESTPLAN}" source_safely "${WORKSPACE}/prepare-csit.sh" # Activate the virtualenv containing all the required libraries installed by prepare-csit.sh -source_safely "${ROBOT_VENV}/bin/activate" +source_safely "${ROBOT3_VENV}/bin/activate" WORKDIR=$(mktemp -d --suffix=-robot-workdir) cd "${WORKDIR}" # Add csit scripts to PATH -export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT_VENV}/bin" +export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT3_VENV}/bin" export SCRIPTS="${WORKSPACE}/scripts" export ROBOT_VARIABLES= |