aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rose <dr695h@att.com>2019-09-10 15:15:52 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-10 15:15:52 +0000
commit09bb9100e5ad7da234283984ed9ec4d7d049953b (patch)
tree3b55a127637a1ed28b77cefa38a39ea3102f3ee5
parent8cfb9aed2aff1102e2ce75438f2b47b0fb063096 (diff)
parent9665fde6182b75d0e42bff0d768b2734f24bbd5c (diff)
Merge "update dfc source to offical product"
-rw-r--r--plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh3
-rw-r--r--scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml3
2 files changed, 2 insertions, 4 deletions
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh
index 2d276e51..bdee34ee 100644
--- 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 9738bcde..9e15ccf0 100644
--- 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