From 4a7bbb4599f3c8bd6755f9a703e560e61028fd8f Mon Sep 17 00:00:00 2001
From: Chandan Kumar <chkumar@redhat.com>
Date: Fri, 6 Apr 2018 12:17:16 +0530
Subject: [PATCH] Rename test_regex to test_white_regex

* https://review.openstack.org/551441 introduced test_black_regex
  in order to skip test directly from featureset files. In order
  to avoid confusion between test_regex and test_black_regex, we
  are renaming test_regex to test_white_regex.
 * It will fix all the featuresets.

Depends-On: https://review.openstack.org/560006
Change-Id: If66225c2e2f8c571cc85aebacee01431e4f64dcc
---
 ci-scripts/full-deploy-internal.sh                     | 2 +-
 ci-scripts/provision_centos_settings.yml               | 2 +-
 config/general_config/deprecated/minimal_pacemaker.yml | 2 +-
 config/general_config/featureset001.yml                | 2 +-
 config/general_config/featureset002.yml                | 2 +-
 config/general_config/featureset005.yml                | 2 +-
 config/general_config/featureset006.yml                | 2 +-
 config/general_config/featureset007.yml                | 2 +-
 config/general_config/featureset008.yml                | 2 +-
 config/general_config/featureset010.yml                | 2 +-
 config/general_config/featureset016.yml                | 2 +-
 config/general_config/featureset017.yml                | 2 +-
 config/general_config/featureset018.yml                | 2 +-
 config/general_config/featureset019.yml                | 2 +-
 config/general_config/featureset020.yml                | 2 +-
 config/general_config/featureset028.yml                | 2 +-
 config/general_config/featureset030.yml                | 2 +-
 config/general_config/featureset032.yml                | 2 +-
 config/general_config/featureset035.yml                | 2 +-
 config/general_config/featureset036.yml                | 2 +-
 config/general_config/featureset037.yml                | 2 +-
 config/general_config/featureset042.yml                | 2 +-
 config/general_config/minimal.yml                      | 2 +-
 config/general_config/pacemaker.yml                    | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ci-scripts/full-deploy-internal.sh b/ci-scripts/full-deploy-internal.sh
index 6076f3ea7..53ea2a251 100644
--- a/ci-scripts/full-deploy-internal.sh
+++ b/ci-scripts/full-deploy-internal.sh
@@ -121,7 +121,7 @@ if [ "$JOB_TYPE" = "promote" ]; then
         OPT_VARS+=("-e tempest_config=true")
         OPT_VARS+=("-e run_tempest=true")
         OPT_VARS+=("-e tempest_workers=4")
-        OPT_VARS+=("-e test_regex=smoke|test_minimum_basic|test_network_basic_ops|test_snapshot_pattern|test_volume_boot_pattern")
+        OPT_VARS+=("-e test_white_regex=smoke|test_minimum_basic|test_network_basic_ops|test_snapshot_pattern|test_volume_boot_pattern")
     fi
 
     # This passes the correct tq release config file for rdo on rhel
diff --git a/ci-scripts/provision_centos_settings.yml b/ci-scripts/provision_centos_settings.yml
index 544211443..b3bd461e4 100644
--- a/ci-scripts/provision_centos_settings.yml
+++ b/ci-scripts/provision_centos_settings.yml
@@ -154,7 +154,7 @@ installer:
   - none
   tempest:
     skip_file: rdoci-rdo-liberty-rdo-manager
-    test_regex: .*smoke
+    test_white_regex: .*smoke
     enabled: true
     cirros_alt:
       url: http://download.cirros-cloud.net/0.3.4/
diff --git a/config/general_config/deprecated/minimal_pacemaker.yml b/config/general_config/deprecated/minimal_pacemaker.yml
index a55b2577a..c3b542574 100644
--- a/config/general_config/deprecated/minimal_pacemaker.yml
+++ b/config/general_config/deprecated/minimal_pacemaker.yml
@@ -32,7 +32,7 @@ test_ping: false
 tempest_config: true
 run_tempest: true
 tempest_workers: 4
-test_regex: smoke|test_minimum_basic|test_network_basic_ops|test_snapshot_pattern|test_volume_boot_pattern
+test_white_regex: smoke|test_minimum_basic|test_network_basic_ops|test_snapshot_pattern|test_volume_boot_pattern
 
 # options below direct automatic doc generation by tripleo-collect-logs
 artcl_gen_docs: true
diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml
index 3bf24619d..890bb5dc3 100644
--- a/config/general_config/featureset001.yml
+++ b/config/general_config/featureset001.yml
@@ -116,7 +116,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
diff --git a/config/general_config/featureset002.yml b/config/general_config/featureset002.yml
index 8a0ea7072..38b8d7902 100644
--- a/config/general_config/featureset002.yml
+++ b/config/general_config/featureset002.yml
@@ -84,7 +84,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
diff --git a/config/general_config/featureset005.yml b/config/general_config/featureset005.yml
index 63eac25d8..44601ac20 100644
--- a/config/general_config/featureset005.yml
+++ b/config/general_config/featureset005.yml
@@ -21,7 +21,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 
 # This enables the run of several tripleo-validations tests through Mistral
 run_tripleo_validations: True
diff --git a/config/general_config/featureset006.yml b/config/general_config/featureset006.yml
index 4efc02629..7fe5d91f2 100644
--- a/config/general_config/featureset006.yml
+++ b/config/general_config/featureset006.yml
@@ -45,7 +45,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist_old:
   # Testing zaqar doesn't work yet, but it's in progress
   # - 'zaqar.tests.tempest_plugin.tests.v2.test_queues.TestManageQueue'
diff --git a/config/general_config/featureset007.yml b/config/general_config/featureset007.yml
index 78fdbca11..76d814c2e 100644
--- a/config/general_config/featureset007.yml
+++ b/config/general_config/featureset007.yml
@@ -45,7 +45,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
   - 'sahara_tempest_plugin.tests.api.test_data_sources.DataSourceTest'
diff --git a/config/general_config/featureset008.yml b/config/general_config/featureset008.yml
index e22611617..76ab12938 100644
--- a/config/general_config/featureset008.yml
+++ b/config/general_config/featureset008.yml
@@ -45,7 +45,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml
index c006f698f..d977a479a 100644
--- a/config/general_config/featureset010.yml
+++ b/config/general_config/featureset010.yml
@@ -25,7 +25,7 @@ exit_on_validations_failure: False
 # run them.
 test_ping: false
 run_tempest: true
-test_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
+test_white_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 composable_roles: true
 overcloud_roles:
   - name: Controller
diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml
index dd643b4d6..0c66cc5d2 100644
--- a/config/general_config/featureset016.yml
+++ b/config/general_config/featureset016.yml
@@ -80,7 +80,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist_old:
   - 'tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern'
   - 'ceilometer.tests.tempest.scenario.test_telemetry_integration.TestTelemetryIntegration'
diff --git a/config/general_config/featureset017.yml b/config/general_config/featureset017.yml
index 0be6c543b..b77e80899 100644
--- a/config/general_config/featureset017.yml
+++ b/config/general_config/featureset017.yml
@@ -78,7 +78,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 # TODO(emilien) run ec2api tests when ec2api is supported in python-tempestconf
 # 'ec2api.tests.functional.api.test_key_pairs.KeyPairTest'
 tempest_whitelist_new:
diff --git a/config/general_config/featureset018.yml b/config/general_config/featureset018.yml
index cccd75ea5..8eb7644df 100644
--- a/config/general_config/featureset018.yml
+++ b/config/general_config/featureset018.yml
@@ -78,7 +78,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
   - 'sahara_tempest_plugin.tests.api.test_data_sources.DataSourceTest'
diff --git a/config/general_config/featureset019.yml b/config/general_config/featureset019.yml
index ba93ea3a1..d02072155 100644
--- a/config/general_config/featureset019.yml
+++ b/config/general_config/featureset019.yml
@@ -78,7 +78,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml
index 40f34dc6a..4cf828881 100644
--- a/config/general_config/featureset020.yml
+++ b/config/general_config/featureset020.yml
@@ -31,7 +31,7 @@ extra_args: >-
 
 # Tempest
 run_tempest: true
-test_regex: '.*'
+test_white_regex: '.*'
 test_ping: false
 # For full tempest run we need to make sure concurrency is not too high
 tempest_workers: 3
diff --git a/config/general_config/featureset028.yml b/config/general_config/featureset028.yml
index 90af7217a..272b1c591 100644
--- a/config/general_config/featureset028.yml
+++ b/config/general_config/featureset028.yml
@@ -46,6 +46,6 @@ overcloud_roles:
 
 test_ping: false
 run_tempest: true
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index 70602a946..42f8d01fa 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -39,7 +39,7 @@ extra_args: >-
 tempest_config: true
 test_ping: false
 run_tempest: true
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
diff --git a/config/general_config/featureset032.yml b/config/general_config/featureset032.yml
index 2221e9c18..a3110314f 100644
--- a/config/general_config/featureset032.yml
+++ b/config/general_config/featureset032.yml
@@ -18,7 +18,7 @@ ssl_overcloud: false
 # run them.
 test_ping: false
 run_tempest: true
-test_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
+test_white_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 composable_roles: false
 
 # Note(trown): The tripleo-ci repo is used here because we do not yet support
diff --git a/config/general_config/featureset035.yml b/config/general_config/featureset035.yml
index 2d3b5ff73..04816fb7c 100644
--- a/config/general_config/featureset035.yml
+++ b/config/general_config/featureset035.yml
@@ -62,7 +62,7 @@ artcl_create_docs_payload:
 
 test_ping: false
 run_tempest: true
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
diff --git a/config/general_config/featureset036.yml b/config/general_config/featureset036.yml
index bd4984765..70af4427a 100644
--- a/config/general_config/featureset036.yml
+++ b/config/general_config/featureset036.yml
@@ -8,7 +8,7 @@ test_ping: false
 
 run_tempest: false
 
-test_regex: ''
+test_white_regex: ''
 
 # This enables the run of several tripleo-validations tests through Mistral
 run_tripleo_validations: false
diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml
index 2c36bea70..64993c239 100644
--- a/config/general_config/featureset037.yml
+++ b/config/general_config/featureset037.yml
@@ -27,7 +27,7 @@ exit_on_validations_failure: false
 # job run time
 test_ping: false
 run_tempest: false
-# test_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
+# test_white_regex: 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
 composable_roles: true
 overcloud_roles:
diff --git a/config/general_config/featureset042.yml b/config/general_config/featureset042.yml
index f9b2808e6..a249fcb4e 100644
--- a/config/general_config/featureset042.yml
+++ b/config/general_config/featureset042.yml
@@ -63,7 +63,7 @@ artcl_create_docs_payload:
 test_ping: false
 run_tempest: true
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
 
diff --git a/config/general_config/minimal.yml b/config/general_config/minimal.yml
index 84ee9c1dc..13ac71f54 100644
--- a/config/general_config/minimal.yml
+++ b/config/general_config/minimal.yml
@@ -81,7 +81,7 @@ test_ping: >-
 # looking for a small set of tempest tests to validate
 # tempest config and execution are working
 run_tempest: true
-test_regex: 'tempest.api.compute.admin'
+test_white_regex: 'tempest.api.compute.admin'
 
 deploy_steps_ansible_workflow: >-
   {% if release not in ['newton','ocata','pike'] -%}
diff --git a/config/general_config/pacemaker.yml b/config/general_config/pacemaker.yml
index aecc3c4d7..bdc691e9e 100644
--- a/config/general_config/pacemaker.yml
+++ b/config/general_config/pacemaker.yml
@@ -85,7 +85,7 @@ run_tempest: >-
   true
   {%- endif -%}
 
-test_regex: ''
+test_white_regex: ''
 tempest_whitelist:
   - 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'