Update DFC tests to use file based conifg

[integration/csit.git] / plans / dcaegen2-collectors-datafile / Functional-suite / setup.sh

diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh
index 2d276e5..2dc7e94 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
@@ -23,6 +22,9 @@ else
        echo "Using SIM_ROOT from environmental variable: " $SIM_ROOT
 fi
 
+#Prepare DFC config volume
+mkdir $SIM_ROOT/simulator-group/dfc_config_volume || true
+
 #Location of the above simulators when run as a group. For start+config and stop.
 SIMGROUP_ROOT=$SIM_ROOT/simulator-group
 
@@ -53,12 +55,11 @@ docker build -t drsim_common:latest .
 cd $SIMGROUP_ROOT
 
 #Copy ftp config for the ftp servers
-cp -r ../ftps-sftp-server/configuration .
-cp -r ../ftps-sftp-server/tls .
-
-cd ../ftps-sftp-server
-docker build -t ftps_vsftpd:latest -f Dockerfile-ftps .
+cp -r ../ftpes-sftp-server/configuration .
+cp -r ../ftpes-sftp-server/tls .
 
+cd ../ftpes-sftp-server
+docker build -t ftpes_vsftpd:latest -f Dockerfile-ftpes .
 
 #All containers will be started and stopped via the robot tests.