From f77c72a265bfc6b03a5a892c93158758de664a54 Mon Sep 17 00:00:00 2001 From: LiamBurke Date: Fri, 3 May 2019 16:22:50 +0100 Subject: Updates for e2e Dublin Change-Id: Iec549a17e07d4656bf57a8492ac4f85b107060f6 Issue-ID: INT-832 Signed-off-by: LiamBurke --- .../usecases/5G-bulkpm/composefile/docker-compose-e2e.yml | 14 +++++++------- plans/usecases/5G-bulkpm/setup.sh | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml index 7880656b..c79c850f 100644 --- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml +++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml @@ -1,7 +1,7 @@ version: '2.1' services: datarouter-prov: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.0-SNAPSHOT-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.0 container_name: datarouter-prov hostname: dmaap-dr-prov ports: @@ -25,7 +25,7 @@ services: - "dcae-pm-mapper:3.3.3.3" datarouter-node: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.0-SNAPSHOT-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.0 container_name: datarouter-node hostname: dmaap-dr-node ports: @@ -41,7 +41,7 @@ services: - "dcae-pm-mapper:3.3.3.3" datarouter-subscriber: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:2.1.0-SNAPSHOT-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:2.1.0 container_name: fileconsumer-node hostname: subscriber.com ports: @@ -76,13 +76,13 @@ services: 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.4.4 environment: DMAAPHOST: 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.1.1 ports: - "8433:8433" extra_hosts: @@ -90,10 +90,10 @@ services: consul: container_name: consul - image: nexus3.onap.org:10001/consul:latest + image: nexus3.onap.org:10001/consul:1.4.4 cbs: container_name: cbs - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.3.0 environment: CONSUL_HOST: \ No newline at end of file diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index 1bba4f30..aa63d154 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -65,7 +65,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 dublin 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