Skip CfnInitIntegrationTest in tempest_heat

It sometimes fails due to other test resources [1].

[1] http://artifacts.opnfv.org/functest/83IV2XRCU05K/functest-opnfv-functest-smoke-latest-tempest_heat-run-53/tempest_heat/tempest-report.html

Change-Id: Ied91781c784370b424653e37c090a909f16b6585
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit f1c7b8055728705988394368926edaa2627eb6d2)

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index deb0411..318606d 100644 (file)
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -81,3 +81,9 @@ object-storage-feature-enabled:
       tempurl,crossdomain,container_quotas,staticweb,account_quotas,slo"
     object_versioning: true
     discoverability: true
+heat_plugin:
+    skip_scenario_test_list: "AodhAlarmTest,SoftwareConfigIntegrationTest,\
+      VolumeBackupRestoreIntegrationTest,CfnInitIntegrationTest"
+    auth_version: 3
+heat_features_enabled:
+    multi_cloud: false

diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
index 9f72c66..9d948ec 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -83,7 +83,7 @@ object-storage-feature-enabled:
     discoverability: true
 heat_plugin:
     skip_scenario_test_list: "AodhAlarmTest,SoftwareConfigIntegrationTest,\
-      VolumeBackupRestoreIntegrationTest"
+      VolumeBackupRestoreIntegrationTest,CfnInitIntegrationTest"
     auth_version: 3
 heat_features_enabled:
     multi_cloud: false

diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
index 2486901..1ab2f9f 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml
@@ -81,7 +81,7 @@ object-storage-feature-enabled:
     discoverability: true
 heat_plugin:
     skip_scenario_test_list: "AodhAlarmTest,SoftwareConfigIntegrationTest,\
-      VolumeBackupRestoreIntegrationTest"
+      VolumeBackupRestoreIntegrationTest,CfnInitIntegrationTest"
     auth_version: 3
 heat_features_enabled:
     multi_cloud: false