From 7e66fd6105aa091add3536dd1158584a28d1676c Mon Sep 17 00:00:00 2001 From: LiamBurke Date: Thu, 13 Dec 2018 17:29:14 +0000 Subject: Updates to use specific casablanca docker versions Change-Id: I461ba1a7c41ceed7952c16898bea860b26fd957b Issue-ID: INT-649 Signed-off-by: LiamBurke --- plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml | 4 ++-- plans/usecases/5G-bulkpm/setup.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml index c5567d81..a206e6f4 100644 --- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -70,12 +70,12 @@ services: dfc: container_name: dfc - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.0.5 ports: - "8433:8433" ves: container_name: vescollector - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1 environment: DMAAPHOST: diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index 64ffac17..0a2b028b 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -5,7 +5,7 @@ source ${SCRIPTS}/common_functions.sh # Clone DMaaP Message Router repo mkdir -p $WORKSPACE/archives/dmaapmr cd $WORKSPACE/archives/dmaapmr -git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master +git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b casablanca sed -i 's/enableCadi: false/enableCadi: "false"/g' /$WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose/docker-compose.yml cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/ @@ -53,7 +53,7 @@ sleep 5 # Clone DMaaP Data Router repo mkdir -p $WORKSPACE/archives/dmaapdr cd $WORKSPACE/archives/dmaapdr -git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master +git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b casablanca cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources mkdir docker-compose cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose -- cgit 1.2.3-korg