From 8cb8fbfdedd419625c6e751f9d19ea27c240e4e2 Mon Sep 17 00:00:00 2001 From: "aditya.puthuparambil" Date: Wed, 27 May 2020 16:54:56 +0100 Subject: [PATCH] Add the Release version of PAP as environment variable Issue-ID: POLICY-2544 Signed-off-by: aditya.puthuparambil Change-Id: Ia9d33b721dab87b91896612e6efcf65378a5c0ff --- testsuites/stability/src/main/resources/papsetup/setup_pap.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testsuites/stability/src/main/resources/papsetup/setup_pap.sh b/testsuites/stability/src/main/resources/papsetup/setup_pap.sh index 235728aa..0f06ed69 100644 --- a/testsuites/stability/src/main/resources/papsetup/setup_pap.sh +++ b/testsuites/stability/src/main/resources/papsetup/setup_pap.sh @@ -31,4 +31,8 @@ else echo "MariaDB IP: ${MARIADB}" fi -docker run -p 9090:9090 -p 6969:6969 -e "PAP_HOST=${PAP}" -v ${DIR}/config/pap/bin/policy-pap.sh:/opt/app/policy/pap/bin/policy-pap.sh -v ${DIR}/config/pap/etc/defaultConfig.json:/opt/app/policy/pap/etc/defaultConfig.json --add-host mariadb:${MARIADB} --name policy-pap -d --rm nexus3.onap.org:10001/onap/policy-pap:2.2-SNAPSHOT-latest +GIT_TOP=$(git rev-parse --show-toplevel) +POLICY_PAP_VERSION_EXTRACT=$(xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' "${GIT_TOP}"/pom.xml) +PAP_IMAGE=policy-pap:${POLICY_PAP_VERSION_EXTRACT:0:3}-SNAPSHOT-latest + +docker run -p 9090:9090 -p 6969:6969 -e "PAP_HOST=${PAP}" -v ${DIR}/config/pap/bin/policy-pap.sh:/opt/app/policy/pap/bin/policy-pap.sh -v ${DIR}/config/pap/etc/defaultConfig.json:/opt/app/policy/pap/etc/defaultConfig.json --add-host mariadb:${MARIADB} --name policy-pap -d nexus3.onap.org:10001/onap/${PAP_IMAGE} -- 2.16.6