From 890802b9816fa0379d0468384909d8e0e6545ede Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 12 Jun 2020 10:04:16 +0200
Subject: Remove RemoteStack testing from tempest_heat_cntt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Trusts redelegation is supported by Train [1][2] which forces to skip
RemoteStack as CNTT Baldy is designed for Pike (the support is
incomplete in case of trust [3]).

[1] https://docs.openstack.org/releasenotes/heat/train.html#relnotes-13-0-0-stable-train
[2] https://github.com/openstack/heat/commit/e377658586c737150dad1bfd80b7b2267d46be51
[3] https://bugs.launchpad.net/heat/+bug/1701498

Change-Id: Ib4f66170b9b1f50b8224705edb4820e5a4cb0167
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 809b2eb2671bfc67d391eeb87b84a772eab04ade)
---
 docker/smoke-cntt/tempest_conf.yaml | 3 ++-
 docker/smoke-cntt/testcases.yaml    | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index c174c7830..3c63afb81 100644
--- a/docker/smoke-cntt/tempest_conf.yaml
+++ b/docker/smoke-cntt/tempest_conf.yaml
@@ -87,9 +87,10 @@ object-storage-feature-enabled:
     object_versioning: true
     discoverability: true
 heat_plugin:
+    skip_functional_test_list: RemoteStackTest
     skip_scenario_test_list: "AodhAlarmTest,SoftwareConfigIntegrationTest,\
       VolumeBackupRestoreIntegrationTest,CfnInitIntegrationTest,\
-      LoadBalancerTest"
+      LoadBalancerTest,RemoteDeeplyNestedStackTest"
     auth_version: 3
 heat_features_enabled:
     multi_cloud: false
diff --git a/docker/smoke-cntt/testcases.yaml b/docker/smoke-cntt/testcases.yaml
index 8d0eee5c3..53ef25d61 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: 120
+                tests_count: 113
                 description: >-
                     This test case runs the Tempest suite proposed by the
                     Heat project.
@@ -120,10 +120,12 @@ tiers:
                     name: tempest_heat
                     args:
                         mode: "(?!.*functional.test_lbaasv2)\
+                          (?!.*functional.test_remote_stack.RemoteStackTest)\
                           (?!.*RemoteStackTest.test_stack_create_with_cloud_credential)\
                           (?!.*scenario.test_aodh_alarm)\
                           (?!.*tests.scenario.test_autoscaling_lb)\
                           (?!.*scenario.test_autoscaling_lbv2)\
+                          (?!.*scenario.test_remote_deeply_nested.RemoteDeeplyNestedStackTest)\
                           (?!.*scenario.test_server_software_config)\
                           (?!.*test_volumes.VolumeBackupRestoreIntegrationTest)\
                           (?!.*scenario.test_octavia_lbaas)\
-- 
cgit 1.2.3-korg