aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rose <dr695h@att.com>2019-09-12 21:44:00 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-12 21:44:00 +0000
commitcab31efaa59bd5260f37385a4cc1a7bf51409467 (patch)
tree0290efc1c71f27eded9a813ca22b2cfb49684047
parent4fea8d1cc585ebeffcfdf693d8f8f9dffda7642c (diff)
parent4805f96ca48e0dc4a9aad9466d116d5a0a2990da (diff)
Merge "Update dfc env variables"
-rw-r--r--plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh5
-rwxr-xr-xtests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot4
2 files changed, 5 insertions, 4 deletions
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
index 0dc2af18..2c46439e 100644
--- a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
+++ b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-running_containers=$(docker ps --filter name=dfc_ -q)
-
+running_containers=$(docker ps --filter name=dfc_ -qa)
+running_images=$(docker images -q)
if [ -z "$running_containers" ]
then
@@ -10,5 +10,6 @@ else
echo "Stopping and removing containers"
docker stop $running_containers
docker rm $running_containers
+ docker rmi $running_images
fi
diff --git a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
index 0763583e..af7b6f1a 100755
--- a/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
+++ b/tests/dcaegen2-collectors-datafile/testsuites/Functional-Single-File-suite/FuncSingleFile.robot
@@ -88,7 +88,7 @@ Verify single event with single 5MB SFTP file. From event poll to published file
Set Environment Variable FTP_TYPE SFTP
Set Environment Variable NUM_FTP_SERVERS 1
Set Environment Variable DR_FEEDS 2:A
- Set Environment Variable DRR_SIM_IP drsim_redir
+ Set Environment Variable DR_REDIR_SIM drsim_redir
Set Environment Variable SFTP_SIMS sftp-server0:22
Set Environment Variable FTPS_SIMS ftpes-server-vsftpd0:21
@@ -150,7 +150,7 @@ Verify single event with single 50MB SFTP file. From event poll to published fil
Set Environment Variable FTP_TYPE SFTP
Set Environment Variable NUM_FTP_SERVERS 1
Set Environment Variable DR_FEEDS 2:A
- Set Environment Variable DRR_SIM_IP drsim_redir
+ Set Environment Variable DR_REDIR_SIM drsim_redir
Set Environment Variable SFTP_SIMS sftp-server0:22
Set Environment Variable FTPS_SIMS ftpes-server-vsftpd0:21