From 4f4849dc9bd3b584e564ccd83651607941f2a95e Mon Sep 17 00:00:00 2001 From: Bilal A Date: Thu, 6 Jun 2019 21:34:50 +0000 Subject: Fix to use dublin branch code for dublin CSITs. Issue-ID: POLICY-1630 Signed-off-by: Bilal A Change-Id: I5df6e411fda9b985545294afc3137f9351ca8e11 --- plans/policy/apex-pdp/setup.sh | 2 +- plans/policy/xacml-pdp/setup.sh | 2 +- scripts/policy/drools-pdp-script.sh | 6 +++--- scripts/policy/engine.sh | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plans/policy/apex-pdp/setup.sh b/plans/policy/apex-pdp/setup.sh index 1e61726b..4e662da8 100644 --- a/plans/policy/apex-pdp/setup.sh +++ b/plans/policy/apex-pdp/setup.sh @@ -53,7 +53,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 dublin 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 diff --git a/plans/policy/xacml-pdp/setup.sh b/plans/policy/xacml-pdp/setup.sh index 24fc2d7c..5036586f 100644 --- a/plans/policy/xacml-pdp/setup.sh +++ b/plans/policy/xacml-pdp/setup.sh @@ -50,7 +50,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 dublin 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 diff --git a/scripts/policy/drools-pdp-script.sh b/scripts/policy/drools-pdp-script.sh index fc8556ff..e6fe51e4 100755 --- a/scripts/policy/drools-pdp-script.sh +++ b/scripts/policy/drools-pdp-script.sh @@ -62,19 +62,19 @@ echo $DOCKER_IP git clone http://gerrit.onap.org/r/oparent -git clone http://gerrit.onap.org/r/policy/engine +git clone -b dublin http://gerrit.onap.org/r/policy/engine cd engine/packages/docker ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn prepare-package --settings ${WORK_DIR}/oparent/settings.xml docker build -t onap/policy-pe target/policy-pe cd ${WORK_DIR} -git clone http://gerrit.onap.org/r/policy/drools-pdp +git clone -b dublin http://gerrit.onap.org/r/policy/drools-pdp cd drools-pdp/packages/docker ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn prepare-package --settings ${WORK_DIR}/oparent/settings.xml docker build -t onap/policy-drools target/policy-drools cd ${WORK_DIR} -git clone http://gerrit.onap.org/r/policy/docker +git clone -b dublin http://gerrit.onap.org/r/policy/docker cd docker chmod +x config/drools/drools-tweaks.sh diff --git a/scripts/policy/engine.sh b/scripts/policy/engine.sh index ef02be5a..a0b4d29c 100755 --- a/scripts/policy/engine.sh +++ b/scripts/policy/engine.sh @@ -62,19 +62,19 @@ echo $DOCKER_IP git clone http://gerrit.onap.org/r/oparent -git clone http://gerrit.onap.org/r/policy/engine +git clone -b dublin http://gerrit.onap.org/r/policy/engine cd engine/packages/docker ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn prepare-package --settings ${WORK_DIR}/oparent/settings.xml docker build -t onap/policy-pe target/policy-pe cd ${WORK_DIR} -git clone http://gerrit.onap.org/r/policy/drools-pdp +git clone -b dublin http://gerrit.onap.org/r/policy/drools-pdp cd drools-pdp/packages/docker ${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn prepare-package --settings ${WORK_DIR}/oparent/settings.xml docker build -t onap/policy-drools target/policy-drools cd ${WORK_DIR} -git clone http://gerrit.onap.org/r/policy/docker +git clone -b dublin http://gerrit.onap.org/r/policy/docker cd docker chmod +x config/drools/drools-tweaks.sh -- cgit 1.2.3-korg