diff options
| author |   Daniel Rose <dr695h@att.com> | 2019-09-09 15:59:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-09 15:59:03 +0000 |
| commit | 2455d20794f872f83b57c395aa0ecc094bf98f36 (patch) | |
| tree | 5d7b98401f1729584c13f6786539cbe7c304577d /plans/dcaegen2-collectors-datafile/Functional-suite | |
| parent | 5fed29a9d3449ad46f5309b4ffa3e76a948881c2 (diff) | |
| parent | e81736c80a95e8766f4305f5bb63e56f14dd798e (diff) | |
Merge "CSIT uplift for CBS, generalized DFC, bugfixes, stability, traceability"
Diffstat (limited to 'plans/dcaegen2-collectors-datafile/Functional-suite')
| -rw-r--r-- | plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh | 28 | ||||
| -rw-r--r-- | plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh | 17 |
2 files changed, 33 insertions, 12 deletions
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh index e2a0c126..2d276e51 100644 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh @@ -3,14 +3,26 @@ #Stop all running containers docker kill "$(docker ps -q -a)" docker rm "$(docker ps -q -a)" +docker system prune -f # Clone Simulators for DFC from integration repo. mkdir -p $WORKSPACE/archives/dfc cd $WORKSPACE/archives/dfc -git clone --depth 1 https://gerrit.onap.org/r/integration -b master -#Location of all individual simulators for DFC -SIM_ROOT=$WORKSPACE/archives/dfc/integration/test/mocks/datafilecollector-testharness + +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 + #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 + + rm $SIM_ROOT/simulator-group/consul/consul/cbs_localhost_config.hcl || true +else + echo "Using SIM_ROOT from environmental variable: " $SIM_ROOT +fi + #Location of the above simulators when run as a group. For start+config and stop. SIMGROUP_ROOT=$SIM_ROOT/simulator-group @@ -20,7 +32,11 @@ SIM_IP="127.0.0.1" DFC_ROOT=$WORKSPACE/scripts/dcaegen2-collectors-datafile/dfc-management #Make the env vars availble to the robot scripts -ROBOT_VARIABLES="-v SIMGROUP_ROOT:${SIMGROUP_ROOT} -v SIM_IP:${SIM_IP} -v DFC_ROOT:${DFC_ROOT}" +ROBOT_VARIABLES="-b debug.log -v SIMGROUP_ROOT:${SIMGROUP_ROOT} -v SIM_IP:${SIM_IP} -v DFC_ROOT:${DFC_ROOT}" + + + + #Build needed simulator images. DR and MR simulators @@ -40,5 +56,9 @@ cd $SIMGROUP_ROOT 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 . + + #All containers will be started and stopped via the robot tests. diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh index 1a0ec6e1..0dc2af18 100644 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh @@ -1,13 +1,14 @@ #!/usr/bin/env bash -#Stop dfc +running_containers=$(docker ps --filter name=dfc_ -q) -kill-instance.sh dfc_app -#Stop all simulators +if [ -z "$running_containers" ] +then + echo "No container requires termination" +else + echo "Stopping and removing containers" + docker stop $running_containers + docker rm $running_containers +fi -kill-instance.sh dfc_dr-sim -kill-instance.sh dfc_dr-redir-sim -kill-instance.sh dfc_mr-sim -kill-instance.sh dfc_sftp-server -kill-instance.sh dfc_ftpes-server-vsftpd
\ No newline at end of file |