Update of Dr branch and DFC version

Change-Id: Iee9ea1e2fa08993e35ae3c903b5b5a3a7e4e695b
Issue-ID: INT-832
Signed-off-by: LiamBurke <liam.burke@ericsson.com>

diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
index 741009a..98b81a0 100644 (file)
--- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
+++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
@@ -82,7 +82,7 @@ services:
 
   dfc:
     container_name: dfc
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.2
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.3
     ports:
       - "8433:8433"
     extra_hosts:

diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh
index aa63d15..d8886f9 100644 (file)
--- a/plans/usecases/5G-bulkpm/setup.sh
+++ b/plans/usecases/5G-bulkpm/setup.sh
@@ -282,7 +282,7 @@ pip install jsonschema uuid simplejson
 # 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