Update policy script for new image structure

Policy docker image structure and the method for building them have
changed and hence the script to build and deploy the images for the CSIT
tests needs to be updated accordingly

Issue-ID: POLICY-652
Change-Id: I2ecde1906c1baa74bbab20711ac521f9b0a5b5a8
Signed-off-by: mmis <michael.morris@ericsson.com>

diff --git a/test/csit/scripts/policy/script1.sh b/test/csit/scripts/policy/script1.sh
index db5b515..d66b073 100755 (executable)
--- a/test/csit/scripts/policy/script1.sh
+++ b/test/csit/scripts/policy/script1.sh
@@ -70,19 +70,22 @@ echo $DOCKER_IP
 
 git clone http://gerrit.onap.org/r/oparent
 
+git clone 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/policy-pe target/policy-pe
+
+cd ${WORK_DIR}
+git clone 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/policy-drools target/policy-drools
+
+cd ${WORK_DIR}
 git clone http://gerrit.onap.org/r/policy/docker
 cd docker
 
-${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn clean install prepare-package --settings ../oparent/settings.xml
-cp policy-pe/* target/policy-pe
-cp policy-drools/* target/policy-drools
-
-docker build -t onap/policy/policy-os     policy-os
-docker build -t onap/policy/policy-db     policy-db
 docker build -t onap/policy/policy-nexus  policy-nexus
-docker build -t onap/policy/policy-base   policy-base
-docker build -t onap/policy/policy-pe     target/policy-pe
-docker build -t onap/policy/policy-drools target/policy-drools
 
 chmod +x config/drools/drools-tweaks.sh