Merge "update dfc source to offical product"

diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh
index 2d276e5..bdee34e 100644 (file)
--- a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh
+++ b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh
@@ -12,8 +12,7 @@ cd $WORKSPACE/archives/dfc
 
 if [ -z "$SIM_ROOT" ]
 then
-       #git clone --depth 1 https://gerrit.onap.org/r/integration -b master
-       git clone https://github.com/yanhuanwang/integration.git
+       git clone --depth 1 https://gerrit.onap.org/r/integration -b master
        #Location of all individual simulators for DFC
        echo "Determine SIM_ROOT based on the WORKSPACE"
        SIM_ROOT=$WORKSPACE/archives/dfc/integration/test/mocks/datafilecollector-testharness

diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml
index 9738bcd..9e15ccf 100644 (file)
--- a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml
+++ b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml
@@ -6,8 +6,7 @@ networks:
 services:
   dfc:
     #image fron Nexus
-    #image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest
-    image: yanhuanwang/dfc:latest
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest
     #local image for test purposes
     #image: org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest
     container_name: dfc_app0