X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fepa_02-additional_capabilities.robot;h=c9db674147ebfc7b8d1e2bb034ccc76675b626e0;hb=7758a5435892700471c8ed109e107eaa16ecc8cf;hp=fd15e5f173d9765e71a79c8b75d3869551f71aa5;hpb=0e696254b8dfd0d2ba854f2c5f62523cbf9eba4c;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/epa_02-additional_capabilities.robot b/robot-systest/testsuite/epa_02-additional_capabilities.robot
index fd15e5f..c9db674 100644
--- a/robot-systest/testsuite/epa_02-additional_capabilities.robot
+++ b/robot-systest/testsuite/epa_02-additional_capabilities.robot
@@ -26,7 +26,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_02-additional_capabilities_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -41,6 +41,7 @@ ${success_return_code}   0
 Create VNF Descriptor
     [Tags]   epa_capabilities   sanity   regression
 
+    Remove Environment Variable  OVERRIDES
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
@@ -105,12 +106,12 @@ Delete VNF Descriptor
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
 
-    Run Keyword If Test Failed  Delete NS  ${ns_name}
+    Run Keyword If Any Tests Failed  Delete NS  ${ns_name}
 
-    Run Keyword If Test Failed  Delete NSD  ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
 
-    Run Keyword If Test Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}