From d46ab2eb2f4254adbe2b9f604b12c0a7f4bf99ed Mon Sep 17 00:00:00 2001 From: Bilal A Date: Fri, 7 Jun 2019 21:25:59 +0000 Subject: 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 Signed-off-by: Bilal A --- scripts/policy/policy-apex-pdp/docker-compose-apex.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/policy/policy-apex-pdp') 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 -- cgit 1.2.3-korg