diff options
Diffstat (limited to 'csit')
| -rwxr-xr-x | csit/prepare-csit.sh | 20 | ||||
| -rwxr-xr-x | csit/run-csit.sh | 12 |
2 files changed, 17 insertions, 15 deletions
diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh index 739266be27..b56c3855dd 100755 --- a/csit/prepare-csit.sh +++ b/csit/prepare-csit.sh @@ -26,25 +26,25 @@ 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 - cd /tmp - source ${WORKSPACE}/install-robotframework.sh -#fi +# rm -rf /tmp/ci-management +# rm -f ${WORKSPACE}/env.properties +# cd /tmp +# source ${WORKSPACE}/install-robotframework.sh +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 python3 -m 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 52ec218630..aefcc8539f 100755 --- a/csit/run-csit.sh +++ b/csit/run-csit.sh @@ -20,6 +20,11 @@ # Branched from ccsdk/distribution to this repository Feb 23, 2021 +# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh +source_safely "${ROBOT3_VENV}/bin/activate" + +WORKDIR=$(mktemp -d --suffix=-robot-workdir) + # # functions # @@ -154,14 +159,11 @@ TESTPLANDIR="${WORKSPACE}/${TESTPLAN}" # Run installation of prerequired libraries 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" - -WORKDIR=$(mktemp -d --suffix=-robot-workdir) +# Use robot framework working directory 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= |