diff options
| author |   Bilal A <bilal@research.att.com> | 2019-06-07 21:25:59 +0000 |
|---|---|---|
| committer | Bilal A <bilal@research.att.com> | 2019-07-03 16:06:05 +0000 |
| commit | d46ab2eb2f4254adbe2b9f604b12c0a7f4bf99ed (patch) | |
| tree | 9c78e684c231f69dd42fbb29d2e9bfbea68f82d7 /plans/policy/xacml-pdp | |
| parent | 4a70dd3bcf1dde19d511f528650b08714b92448f (diff) | |
Pull correct docker images for master branch
Enables Policy CSITs for API, PAP, Distribution, Drools-applications,
Apex-PDP and XACML-PDP to pull correct docker images based on the
code branch.
--------------
Updating the policy model json in apex-pdp csit
Changes were made to read the policy model as proper json instead of
json formatted string in APEX-PDP. With this fix in place, the policy
tosca json file need to be updated with the proper json.
Issue-ID: POLICY-1836
Issue-ID: POLICY-1796
Change-Id: I6b99c8ae9cb78dd8ebddc522bc2a7080ec6e5735
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Signed-off-by: Bilal A <bilal@research.att.com>
Diffstat (limited to 'plans/policy/xacml-pdp')
| -rw-r--r-- | plans/policy/xacml-pdp/setup.sh | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/plans/policy/xacml-pdp/setup.sh b/plans/policy/xacml-pdp/setup.sh index 24fc2d7c..1d4325bd 100644 --- a/plans/policy/xacml-pdp/setup.sh +++ b/plans/policy/xacml-pdp/setup.sh @@ -17,6 +17,11 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= +source ${SCRIPTS}/policy/config/policy-csit.conf +export POLICY_MARIADB_VER +echo ${GERRIT_BRANCH} +echo ${POLICY_MARIADB_VER} + echo "Uninstall docker-py and reinstall docker." pip uninstall -y docker-py pip uninstall -y docker @@ -50,7 +55,7 @@ ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v cd .. git clone http://gerrit.onap.org/r/oparent -git clone --depth 1 https://gerrit.onap.org/r/policy/models -b master +git clone --depth 1 https://gerrit.onap.org/r/policy/models -b ${GERRIT_BRANCH} cd models/models-sim/models-sim-dmaap ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn clean install -DskipTests --settings ${WORK_DIR}/oparent/settings.xml bash ./src/main/package/docker/docker_build.sh @@ -58,6 +63,16 @@ cd ${WORKSPACE} rm -rf ${WORK_DIR} sleep 3 + + +sudo apt-get -y install libxml2-utils +export POLICY_API_VERSION="$(curl -q --silent https://git.onap.org/policy/api/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)" +export POLICY_PAP_VERSION="$(curl -q --silent https://git.onap.org/policy/pap/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)" +export POLICY_XACML_PDP_VERSION="$(curl -q --silent https://git.onap.org/policy/xacml-pdp/plain/pom.xml?h=${GERRIT_BRANCH} | xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' -)" + +echo ${POLICY_API_VERSION} +echo ${POLICY_PAP_VERSION} +echo ${POLICY_XACML_PDP_VERSION} # Adding this waiting container due to race condition between pap and mariadb docker-compose -f ${WORKSPACE}/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml run --rm start_dependencies |