From ddfeb338021135874c174e5fd2111ced5e6cc211 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 1 Dec 2022 17:05:32 -0500 Subject: Update parent pom version to 2.4.6 Update parent pom version to 2.4.6 to pick up dmaap client version fix Issue-ID: CCSDK-3796 Signed-off-by: Dan Timoney Change-Id: I454ce31d105a7b304f765396f2d7964d587ee480 Fix: upgrade to robotframework py3 script Issue-ID: CIMAN-33 Signed-off-by: Kevin Sandi Change-Id: I409cc94cb5c9a8981d0dc3562bc9e69cfd3784db Signed-off-by: Dan Timoney --- csit/prepare-csit.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'csit/prepare-csit.sh') diff --git a/csit/prepare-csit.sh b/csit/prepare-csit.sh index 163698d6..ed820434 100755 --- a/csit/prepare-csit.sh +++ b/csit/prepare-csit.sh @@ -26,26 +26,26 @@ fi TESTPLANDIR=${WORKSPACE}/${TESTPLAN} -# Assume that if ROBOT_VENV is set and virtualenv with system site packages can be activated, -# ci-management/jjb/integration/include-raw-integration-install-robotframework.sh has already +# 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-py3.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 git clone "https://gerrit.onap.org/r/ci-management" - source /tmp/ci-management/jjb/integration/include-raw-integration-install-robotframework.sh + source /tmp/ci-management/jjb/integration/include-raw-integration-install-robotframework-py3.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 pip install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.5.1.*' --pre pip freeze -- cgit 1.2.3-korg