Skip Test cases when features are optional or newer than CNTT

- The microversion range[3.70 - latest] of this test is out of the configuration range[None - 3.64].
- Volume multi-attach is not available.
- l3-ndp-proxy extension not enabled.

Change-Id: Iad71cd9c77f1f79b90c1bbed00d4dd4db0f92cb6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/smoke-cntt/testcases.yaml b/docker/smoke-cntt/testcases.yaml
index fdef6bc..41d7df1 100644 (file)
--- a/docker/smoke-cntt/testcases.yaml
+++ b/docker/smoke-cntt/testcases.yaml
@@ -37,6 +37,8 @@ tiers:
                             (?!.*test_local_ip)\
                             (?!.*test_metering_extensions)\
                             (?!.*test_metering_negative)\
+                            (?!.*test_ndp_proxy)\
+                            (?!.*test_ndp_proxy_negative)\
                             (?!.*test_networks.NetworksSearchCriteriaTest.test_list_validation_filters)\
                             (?!.*test_networks.NetworksTestAdmin.test_create_tenant_network_vxlan)\
                             (?!.*test_networks.NetworksTestJSON.test_create_update_network_dns_domain)\
@@ -80,7 +82,7 @@ tiers:
                 criteria: 100
                 blocking: false
                 deny_skipping: true
-                tests_count: 10
+                tests_count: 13
                 description: >-
                     This test case runs the Tempest suite proposed by the
                     Cinder project.
@@ -91,7 +93,9 @@ tiers:
                             (?!.*test_consistencygroups)\
                             (?!.*test_backup_crossproject_admin_negative)\
                             (?!.*test_backup_crossproject_user_negative)\
+                            (?!.*test_encrypted_volume_transfer)\
                             (?!.*test_volume_encrypted.TestEncryptedCinderVolumes)\
+                            (?!.*test_volume_multiattach)\
                             (?!.*rbac)\
                             (^cinder_tempest_plugin.)"
                         option:

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index d5bb795..fe80338 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -638,6 +638,8 @@ tiers:
                             (?!.*test_local_ip)\
                             (?!.*test_metering_extensions)\
                             (?!.*test_metering_negative)\
+                            (?!.*test_ndp_proxy)\
+                            (?!.*test_ndp_proxy_negative)\
                             (?!.*test_networks.NetworksSearchCriteriaTest.test_list_validation_filters)\
                             (?!.*test_networks.NetworksTestAdmin.test_create_tenant_network_vxlan)\
                             (?!.*test_networks.NetworksTestJSON.test_create_update_network_dns_domain)\
@@ -680,7 +682,7 @@ tiers:
                 criteria: 100
                 blocking: false
                 deny_skipping: true
-                tests_count: 10
+                tests_count: 13
                 description: >-
                     This test case runs the Tempest suite proposed by the
                     Cinder project.
@@ -691,7 +693,9 @@ tiers:
                             (?!.*test_consistencygroups)\
                             (?!.*test_backup_crossproject_admin_negative)\
                             (?!.*test_backup_crossproject_user_negative)\
+                            (?!.*test_encrypted_volume_transfer)\
                             (?!.*test_volume_encrypted.TestEncryptedCinderVolumes)\
+                            (?!.*test_volume_multiattach)\
                             (?!.*rbac)\
                             (^cinder_tempest_plugin.)"
                         option: