From 95ce02b0bb815e0dedb65344b89eb1f15f161d21 Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Fri, 3 Jan 2020 13:14:37 +0200
Subject: [PATCH] Split fs20 periodic tempest - api* in fs1 scenario* in fs20

We want to reduce tests in fs20 for stability and runtime.
Tracked by tripleo-ci squad in [1]. Testing in [2].
Depends-On bumps fs1 timeout to 5hrs.

[1] https://tree.taiga.io/project/tripleo-ci-board/task/1383
[2] https://review.rdoproject.org/r/#/c/24339/
Depends-On: https://review.rdoproject.org/r/24781
Change-Id: I9c434b7a907f02aee712bebe532abcae1a948320
---
 config/general_config/featureset001.yml | 17 ++++++++++++++---
 config/general_config/featureset020.yml | 20 +++++++++++++++++---
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml
index c34670dc2..93768b4c1 100644
--- a/config/general_config/featureset001.yml
+++ b/config/general_config/featureset001.yml
@@ -147,9 +147,6 @@ use_os_tempest: >-
   false
   {%- endif -%}
 
-tempest_test_whitelist:
-  - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
-
 # It will create a public network name 'public' using os_tempest
 tempest_interface_name: public
 
@@ -193,6 +190,20 @@ tempest_tempest_conf_overrides:
 test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
+
+# For periodic pipeline run tempest *.api tests in fs001
+# See https://tree.taiga.io/project/tripleo-ci-board/task/1383
+tempest_periodic_whitelist:
+  - 'tempest.api'
+  - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps'
+
+tempest_test_whitelist: >-
+  {% if ('periodic' in zuul.pipeline and not job.force_non_periodic|default(false)|bool) or (job.force_periodic|default(false)|bool) -%}
+  {{ tempest_periodic_whitelist }}
+  {%- else -%}
+  - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps'
+  {%- endif -%}
+
 tempest_format: >-
   {% if containerized_undercloud|bool -%}
   container
diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml
index c327a3c2a..fd12e66f3 100644
--- a/config/general_config/featureset020.yml
+++ b/config/general_config/featureset020.yml
@@ -207,14 +207,28 @@ tempest_tempestconf_profile:
   network-id: "{{ tempest_neutron_public_network_id }}"
   overrides: "{{ tempest_tempest_conf_overrides | default('omit') }}"
 
-# Running all api and scenario tests
-tempest_test_whitelist:
-  - 'tempest.api'
+check_test_whitelist:
   - 'tempest.scenario'
+  - 'tempest.api'
   - 'keystone_tempest_plugin'
   - 'neutron_tempest_plugin'
   - 'cinder_tempest_plugin'
 
+periodic_test_whitelist:
+  - 'tempest.scenario'
+  - 'keystone_tempest_plugin.scenario'
+  - 'neutron_tempest_plugin.scenario'
+  - 'cinder_tempest_plugin.scenario'
+
+# featureset 20 **periodic** runs scenario but no api tempest tests
+# See https://tree.taiga.io/project/tripleo-ci-board/task/1383
+tempest_test_whitelist: >-
+  {% if ('periodic' in zuul.pipeline and not job.force_non_periodic|default(false)|bool) or (job.force_periodic|default(false)|bool) -%}
+  {{ periodic_test_whitelist }}
+  {%- else -%}
+  {{ check_test_whitelist }}
+  {%- endif -%}
+
 # Set tempest concurrency
 # Only in this particular featureset we are setting concurrency to 4 because it
 # runs full tempest and it's timeing out. Usually we set concurrency to 2