Merge "Remove installer type from tempest blacklist"

1 files changed, 3 insertions, 7 deletions

diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 4f8002e26..542ed9ed0 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -167,19 +167,15 @@ class TempestCommon(singlevm.VmReady1):
         result_file = open(self.list, 'w')
         black_tests = []
         try:
-            installer_type = env.get('INSTALLER_TYPE')
             deploy_scenario = env.get('DEPLOY_SCENARIO')
-            if bool(installer_type) * bool(deploy_scenario):
-                # if INSTALLER_TYPE and DEPLOY_SCENARIO are set we read the
-                # file
+            if bool(deploy_scenario):
+                # if DEPLOY_SCENARIO is set we read the file
                 black_list_file = open(conf_utils.TEMPEST_BLACKLIST)
                 black_list_yaml = yaml.safe_load(black_list_file)
                 black_list_file.close()
                 for item in black_list_yaml:
                     scenarios = item['scenarios']
-                    installers = item['installers']
-                    if (deploy_scenario in scenarios and
-                            installer_type in installers):
+                    if deploy_scenario in scenarios:
                         tests = item['tests']
                         for test in tests:
                             black_tests.append(test)