From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 27 Apr 2020 23:16:35 +0000 (+0200)
Subject: Skip CfnInitIntegrationTest in tempest_heat
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F70004%2F1;p=functest.git

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 fb9c5d060..5883cab9b 100644
--- 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 ed82ba6d4..f35b67d09 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.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
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 ed82ba6d4..f35b67d09 100644
--- 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