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>

6 files changed, 21 insertions, 19 deletions

diff --git a/scripts/policy/config/policy-csit.conf b/scripts/policy/config/policy-csit.conf
new file mode 100644
index 00000000..aa5f9396
--- /dev/null
+++ b/scripts/policy/config/policy-csit.conf
@@ -0,0 +1,2 @@
+GERRIT_BRANCH=master
+POLICY_MARIADB_VER=10.2.25
diff --git a/scripts/policy/docker-compose-api.yml b/scripts/policy/docker-compose-api.yml
index 5cf5a27c..1bab1894 100644
--- a/scripts/policy/docker-compose-api.yml
+++ b/scripts/policy/docker-compose-api.yml
@@ -17,7 +17,7 @@ networks:
     driver: bridge
 services:
    mariadb:
-      image: mariadb:10.2.14
+      image: mariadb:${POLICY_MARIADB_VER}
       container_name: mariadb
       hostname: mariadb
       command: ['--lower-case-table-names=1', '--wait_timeout=28800']
@@ -27,9 +27,9 @@ services:
       ports:
        - "3306:3306"
    api:
-      image: nexus3.onap.org:10001/onap/policy-api
+      image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
       container_name: policy-api
-      depends_on: 
+      depends_on:
        - mariadb
       hostname: policy-api
       ports:
diff --git a/scripts/policy/docker-compose-drools-apps.yml b/scripts/policy/docker-compose-drools-apps.yml
index a42c2996..14a2161f 100644
--- a/scripts/policy/docker-compose-drools-apps.yml
+++ b/scripts/policy/docker-compose-drools-apps.yml
@@ -14,20 +14,20 @@
 version: '2'
 services:
    mariadb:
-      image: mariadb:10.2.14
+      image: mariadb:${POLICY_MARIADB_VER}
       container_name: mariadb
       hostname: mariadb
       command: ['--lower-case-table-names=1', '--wait_timeout=28800']
-      env_file: 
+      env_file:
          - ${WORKSPACE}/scripts/policy/config/db/db.conf
       volumes:
          - ${WORKSPACE}/scripts/policy/config/db:/docker-entrypoint-initdb.d
       expose:
        - 3306
    drools:
-      image: nexus3.onap.org:10001/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest
+      image: nexus3.onap.org:10001/onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
       container_name: drools
-      depends_on: 
+      depends_on:
        - mariadb
       hostname: drools
       expose:
diff --git a/scripts/policy/docker-compose-pap.yml b/scripts/policy/docker-compose-pap.yml
index 383e1bc8..970f1168 100644
--- a/scripts/policy/docker-compose-pap.yml
+++ b/scripts/policy/docker-compose-pap.yml
@@ -17,7 +17,7 @@ networks:
     driver: bridge
 services:
    mariadb:
-      image: mariadb:10.2.14
+      image: mariadb:${POLICY_MARIADB_VER}
       container_name: mariadb
       hostname: mariadb
       command: ['--lower-case-table-names=1', '--wait_timeout=28800']
@@ -27,15 +27,15 @@ services:
       ports:
        - "3306:3306"
    pap:
-      image: nexus3.onap.org:10001/onap/policy-pap
+      image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
       container_name: policy-pap
-      depends_on: 
+      depends_on:
        - mariadb
       hostname: policy-pap
       ports:
        - "6969:6969"
    api:
-      image: nexus3.onap.org:10001/onap/policy-api
+      image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
       container_name: policy-api
       depends_on:
        - mariadb
diff --git a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
index c6578dda..c01aaaa5 100644
--- a/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
+++ b/scripts/policy/policy-apex-pdp/docker-compose-apex.yml
@@ -18,7 +18,7 @@ networks:
     driver: bridge
 services:
    mariadb:
-      image: mariadb:10.2.14
+      image: mariadb:${POLICY_MARIADB_VER}
       container_name: mariadb
       hostname: mariadb
       command: ['--lower-case-table-names=1', '--wait_timeout=28800']
@@ -34,7 +34,7 @@ services:
       ports:
        - "3904:3904"
    pap:
-      image: nexus3.onap.org:10001/onap/policy-pap
+      image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
       container_name: policy-pap
       depends_on:
        - mariadb
@@ -42,13 +42,13 @@ services:
       hostname: policy-pap
 
    api:
-      image: nexus3.onap.org:10001/onap/policy-api
+      image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
       container_name: policy-api
       depends_on:
        - mariadb
       hostname: policy-api
    apex:
-      image: nexus3.onap.org:10001/onap/policy-apex-pdp
+      image: nexus3.onap.org:10001/onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
       container_name: policy-apex-pdp
       depends_on:
        - mariadb
diff --git a/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml b/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml
index 96a4b122..af1cbaee 100644
--- a/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml
+++ b/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml
@@ -21,7 +21,7 @@ networks:
     driver: bridge
 services:
    mariadb:
-      image: mariadb:10.2.14
+      image: mariadb:${POLICY_MARIADB_VER}
       container_name: mariadb
       hostname: mariadb
       command: ['--lower-case-table-names=1', '--wait_timeout=28800']
@@ -37,20 +37,20 @@ services:
       ports:
        - "3904:3904"
    pap:
-      image: nexus3.onap.org:10001/onap/policy-pap
+      image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
       container_name: policy-pap
       depends_on:
        - mariadb
        - message-router
       hostname: policy-pap
    api:
-      image: nexus3.onap.org:10001/onap/policy-api
+      image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
       container_name: policy-api
       depends_on:
        - mariadb
       hostname: policy-api
    xacml-pdp:
-      image: nexus3.onap.org:10001/onap/policy-xacml-pdp
+      image: nexus3.onap.org:10001/onap/policy-xacml-pdp:${POLICY_XACML_PDP_VERSION}
       container_name: policy-xacml-pdp
       depends_on:
        - mariadb