From 04f5410c24532bc39f564e847d9ae3fe71cd4ab9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Fri, 12 Jun 2020 15:25:42 +0200
Subject: [PATCH] Skip EncryptionVolTypeTest in Iaas verification and CNTT
Conformance
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
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)
---
docker/smoke-cntt/tempest_conf.yaml | 2 +-
docker/smoke-cntt/testcases.yaml | 3 ++-
functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml | 1 +
.../opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index d7a25d866..e4c88b8b0 100644
--- 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 53ef25d61..7e5abc269 100644
--- a/docker/smoke-cntt/testcases.yaml
+++ b/docker/smoke-cntt/testcases.yaml
@@ -112,7 +112,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.
@@ -120,6 +120,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 4cbe2a20b..be18a3662 100644
--- 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 ab71bf0a7..0c878c6ee 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
@@ -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"
--
2.16.6