diff options
| -rwxr-xr-x | csit/prepare-csit.sh | 20 | ||||
| -rwxr-xr-x | csit/run-csit.sh | 4 |
2 files changed, 13 insertions, 11 deletions
diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh index c40f4c1bfe..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 -else - rm -rf /tmp/ci-management - rm -f ${WORKSPACE}/env.properties - cd /tmp - source ${WORKSPACE}/install-robotframework.sh +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 # 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 f291e34183..aefcc8539f 100755 --- a/csit/run-csit.sh +++ b/csit/run-csit.sh @@ -24,7 +24,6 @@ source_safely "${ROBOT3_VENV}/bin/activate" WORKDIR=$(mktemp -d --suffix=-robot-workdir) -cd "${WORKDIR}" # # functions @@ -160,6 +159,9 @@ TESTPLANDIR="${WORKSPACE}/${TESTPLAN}" # Run installation of prerequired libraries source_safely "${WORKSPACE}/prepare-csit.sh" +# Use robot framework working directory +cd "${WORKDIR}" + # Add csit scripts to PATH export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT3_VENV}/bin" export SCRIPTS="${WORKSPACE}/scripts" |