4 files changed, 28 insertions, 3 deletions
diff --git a/testcases/OpenStack/healthcheck/healthcheck.sh b/testcases/OpenStack/healthcheck/healthcheck.sh
index 2449ac93b..996aadcf7 100755
--- a/testcases/OpenStack/healthcheck/healthcheck.sh
+++ b/testcases/OpenStack/healthcheck/healthcheck.sh
@@ -120,6 +120,7 @@ info "...Keystone OK!"
 info "Testing Glance API..."
 #################################
 disk_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.disk_image 2> /dev/null || true)
+disk_format=$(cat ${YAML_FILE} | shyaml get-value healthcheck.disk_format 2> /dev/null || true)
 kernel_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.kernel_image 2> /dev/null || true)
 ramdisk_img=$(cat ${YAML_FILE} | shyaml get-value healthcheck.ramdisk_image 2> /dev/null || true)
 extra_properties=$(cat ${YAML_FILE} | shyaml get-value healthcheck.extra_properties 2> /dev/null || true)
@@ -151,10 +152,10 @@ fi
 
 debug "image extra_properties=${extra_properties}"
 
-eval glance image-create --name ${image_1} --disk-format qcow2 --container-format bare \
+eval glance image-create --name ${image_1} --disk-format ${disk_format} --container-format bare \
              ${extra_opts} < ${disk_img}
 debug "image '${image_1}' created."
-eval glance image-create --name ${image_2} --disk-format qcow2 --container-format bare \
+eval glance image-create --name ${image_2} --disk-format ${disk_format} --container-format bare \
              ${extra_opts} < ${disk_img}
 debug "image '${image_2}' created."
 info "... Glance OK!"
diff --git a/testcases/OpenStack/tempest/custom_tests/blacklist.txt b/testcases/OpenStack/tempest/custom_tests/blacklist.txt
index 5dd8fe2e1..ddd41e688 100644
--- a/testcases/OpenStack/tempest/custom_tests/blacklist.txt
+++ b/testcases/OpenStack/tempest/custom_tests/blacklist.txt
@@ -31,3 +31,20 @@
         - joid
     tests:
         - tempest.api.object_storage
+
+    scenarios:
+        - os-onos-nofeature-ha
+        - os-onos-nofeature-noha
+        - os-onos-sfc-ha
+        - os-onos-sfc-noha
+    installers:
+        - fuel
+        - apex
+        - joid
+        - compass
+    tests:
+        - tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_hard
+        - tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops
+        - tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
+        - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern
+        - tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern
diff --git a/testcases/OpenStack/tempest/gen_tempest_conf.py b/testcases/OpenStack/tempest/gen_tempest_conf.py
index 79236b958..4aa814a51 100755
--- a/testcases/OpenStack/tempest/gen_tempest_conf.py
+++ b/testcases/OpenStack/tempest/gen_tempest_conf.py
@@ -17,6 +17,7 @@ import shutil
 import functest.utils.functest_utils as ft_utils
 import functest.utils.functest_logger as ft_logger
 from run_tempest import configure_tempest
+from run_tempest import TEMPEST_RESULTS_DIR
 
 logger = ft_logger.Logger("multisite").getLogger()
 
@@ -112,6 +113,9 @@ def configure_tempest_multisite(deployment_dir):
 
 def main():
 
+    if not os.path.exists(TEMPEST_RESULTS_DIR):
+        os.makedirs(TEMPEST_RESULTS_DIR)
+
     deployment_dir = ft_utils.get_deployment_dir(logger)
     configure_tempest_multisite(deployment_dir)
 
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index 3a8d8d72a..c143fffae 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -365,6 +365,8 @@ def run_tempest(OPTION):
 
     if 'smoke' in args.mode:
         case_name = 'tempest_smoke_serial'
+    elif 'feature' in args.mode:
+        case_name = args.mode.replace("feature_", "")
     else:
         case_name = 'tempest_full_parallel'
 
@@ -422,7 +424,8 @@ def main():
 
     deployment_dir = ft_utils.get_deployment_dir(logger)
 
-    if "" != args.conf:
+    if "" == args.conf:
+        MODE = ""
         configure_tempest(deployment_dir)
     else:
         MODE = " --tempest-config " + args.conf