Skip EncryptionVolTypeTest in Iaas verification and CNTT Conformance

Attaching an encryted volume is optional in CNTT [1].

This test fails if the volume type already exists and if it runs
twice in parallel [2]. As this single test doesn't fullfil the Functest
requirements, it's skiped in the classical verification as well.

[1] https://github.com/cntt-n/CNTT/blob/master/doc/ref_arch/openstack/chapters/chapter05.md
[2] https://storyboard.openstack.org/#!/story/2007804

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

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index d7a25d8..e4c88b8 100644 (file)
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -89,7 +89,7 @@ object-storage-feature-enabled:
     object_versioning: true
     discoverability: true
 heat_plugin:
-    skip_functional_test_list: RemoteStackTest
+    skip_functional_test_list: RemoteStackTest,EncryptionVolTypeTest
     skip_scenario_test_list: "AodhAlarmTest,SoftwareConfigIntegrationTest,\
       VolumeBackupRestoreIntegrationTest,CfnInitIntegrationTest,\
       LoadBalancerTest,RemoteDeeplyNestedStackTest"

diff --git a/docker/smoke-cntt/testcases.yaml b/docker/smoke-cntt/testcases.yaml
index c732b7a..e216370 100644 (file)
--- a/docker/smoke-cntt/testcases.yaml
+++ b/docker/smoke-cntt/testcases.yaml
@@ -114,7 +114,7 @@ tiers:
                 criteria: 100
                 blocking: false
                 deny_skipping: true
-                tests_count: 113
+                tests_count: 112
                 description: >-
                     This test case runs the Tempest suite proposed by the
                     Heat project.
@@ -122,6 +122,7 @@ tiers:
                     name: tempest_heat
                     args:
                         mode: "(?!.*functional.test_lbaasv2)\
+                          (?!.*functional.test_encryption_vol_type)\
                           (?!.*functional.test_remote_stack.RemoteStackTest)\
                           (?!.*RemoteStackTest.test_stack_create_with_cloud_credential)\
                           (?!.*scenario.test_aodh_alarm)\

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 aacf1d5..aa61e37 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -89,6 +89,7 @@ object-storage-feature-enabled:
     object_versioning: true
     discoverability: true
 heat_plugin:
+    skip_functional_test_list: EncryptionVolTypeTest
     skip_scenario_test_list: "AodhAlarmTest,SoftwareConfigIntegrationTest,\
       VolumeBackupRestoreIntegrationTest,CfnInitIntegrationTest,\
       LoadBalancerTest"

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 212e55e..1b5d726 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
@@ -89,6 +89,7 @@ object-storage-feature-enabled:
     object_versioning: true
     discoverability: true
 heat_plugin:
+    skip_functional_test_list: EncryptionVolTypeTest
     skip_scenario_test_list: "AodhAlarmTest,SoftwareConfigIntegrationTest,\
       VolumeBackupRestoreIntegrationTest,CfnInitIntegrationTest,\
       LoadBalancerTest"