Only performs our teardown process for necessary test cases
Change-Id: I349d1217df6e0dc85c1a0ede2b899081c720abcd
diff --git a/Makefile b/Makefile
index 8ec2897..3b6f8c0 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@
system-scale-test: voltha-test
failure-test: ROBOT_MISC_ARGS += -X -i FailureTest $(ROBOT_DEBUG_LOG_OPT)
-failure-test: ROBOT_FILE := $(ROBOT_SYSTEM_FILE)
+failure-test: ROBOT_FILE := K8S_SystemTest.robot
failure-test: ROBOT_CONFIG_FILE := $(ROBOT_FAIL_SINGLE_PON_FILE)
failure-test: voltha-test
diff --git a/tests/functional/K8S_SystemTest.robot b/tests/functional/K8S_SystemTest.robot
index 7810ef8..74f8ad5 100644
--- a/tests/functional/K8S_SystemTest.robot
+++ b/tests/functional/K8S_SystemTest.robot
@@ -17,7 +17,6 @@
Suite Setup Common Test Suite Setup
Test Setup Setup
Test Teardown Teardown
-Suite Teardown Teardown Suite
Resource ../../libraries/onos.robot
Resource ../../libraries/voltctl.robot
Resource ../../libraries/voltha.robot
@@ -42,6 +41,11 @@
ECTD Scale Test
[Documentation] Perform the sanity test if some ETCD endpoints crash
[Tags] functional bbsim
+ [Setup] Run Keywords Announce Message START TEST SanityTest
+ ... AND Setup
+ [Teardown] Run Keywords Collect Logs
+ ... AND Announce Message END TEST SanityTest
+ ... AND Teardown Suite
${current_size}= Get ETCD Running Size voltha
Pass Execution If '${current_size}' != '${desired_ETCD_cluster_size}'
... 'Skip the test if the cluster size smaller than minimal size 3'