summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2022-12-01 17:05:32 -0500
committerDan Timoney <dtimoney@att.com>2022-12-09 07:28:36 -0500
commitddfeb338021135874c174e5fd2111ced5e6cc211 (patch)
treecda5242c2d93caa22968441ea4212ce9b1f7926b
parent45ad49f180cd5711fd36e4ffac16060968e7a519 (diff)
Update parent pom version to 2.4.61.4.3
Update parent pom version to 2.4.6 to pick up dmaap client version fix Issue-ID: CCSDK-3796 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I454ce31d105a7b304f765396f2d7964d587ee480 Fix: upgrade to robotframework py3 script Issue-ID: CIMAN-33 Signed-off-by: Kevin Sandi <ksandi@contractor.linuxfoundation.org> Change-Id: I409cc94cb5c9a8981d0dc3562bc9e69cfd3784db Signed-off-by: Dan Timoney <dtimoney@att.com>
-rwxr-xr-xcsit/prepare-csit.sh14
-rw-r--r--pom.xml2
2 files changed, 8 insertions, 8 deletions
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
diff --git a/pom.xml b/pom.xml
index 2ee47d62..18d01d98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>oparent</artifactId>
- <version>2.4.4</version>
+ <version>2.4.5</version>
</parent>
<groupId>org.onap.ccsdk.distribution</groupId>