From 9d285e0bb4447038d231d70d0dac0f4d7d5b689a Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Wed, 10 Feb 2021 17:02:43 -0600
Subject: [PATCH] Switch to new rolevar for run-tempest role

Tempest replaced the below rolevar for run-tempest role
- tempest_test_blacklist is replaced by tempest_test_exclude_list
- tempest_black_regex is replaced by tempest_exclude_regex

old name are still supported for compatiblity but we recommend
to switch to new one.

Change-Id: I4f2d01a4cf443f9c539158e77032cd3d8ce24ad7
---
 .zuul.yaml                                         | 14 +++++++-------
 ...cklist.txt => nova-multi-cell-exclude-list.txt} |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename devstack/{nova-multi-cell-blacklist.txt => nova-multi-cell-exclude-list.txt} (86%)

diff --git a/.zuul.yaml b/.zuul.yaml
index f98e714b2eca..a2d91ba6cbd0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -136,12 +136,12 @@
       - ^tox.ini$
     vars:
       # We use the "all" environment for tempest_test_regex and
-      # tempest_black_regex.
+      # tempest_exclude_regex.
       tox_envlist: all
       # Only run compute API tests.
       tempest_test_regex: ^tempest\.api\.compute
       # Skip slow tests.
-      tempest_black_regex: .*\[.*\bslow\b.*\]
+      tempest_exclude_regex: .*\[.*\bslow\b.*\]
       devstack_local_conf:
         test-config:
           $TEMPEST_CONFIG:
@@ -185,7 +185,7 @@
     post-run: playbooks/nova-next/post.yaml
     vars:
       # We use the "all" environment for tempest_test_regex and
-      # tempest_black_regex.
+      # tempest_exclude_regex.
       tox_envlist: all
       # Run all compute API tests and most scenario tests at the default
       # concurrency (nproc/2 which is normally 4 in the gate).
@@ -193,8 +193,8 @@
       # The tempest.scenario.test_network* tests are skipped because they
       # (1) take a long time and (2) are already covered in the
       # tempest-slow* job. If this regex gets more complicated use
-      # tempest_test_blacklist.
-      tempest_black_regex: ^tempest.scenario.test_network
+      # tempest_test_exclude_list.
+      tempest_exclude_regex: ^tempest.scenario.test_network
       devstack_local_conf:
         post-config:
           $NOVA_CPU_CONF:
@@ -303,11 +303,11 @@
     irrelevant-files: *dsvm-irrelevant-files
     vars:
       # We use the "all" environment for tempest_test_regex and
-      # tempest_test_blacklist.
+      # tempest_test_exclude_list.
       tox_envlist: all
       # Run compute API and scenario tests.
       tempest_test_regex: ^tempest\.(scenario|(api\.compute))
-      tempest_test_blacklist: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/nova"].src_dir }}/devstack/nova-multi-cell-blacklist.txt'
+      tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/nova"].src_dir }}/devstack/nova-multi-cell-exclude-list.txt'
       devstack_local_conf:
         post-config:
           $NOVA_CONF:
diff --git a/devstack/nova-multi-cell-blacklist.txt b/devstack/nova-multi-cell-exclude-list.txt
similarity index 86%
rename from devstack/nova-multi-cell-blacklist.txt
rename to devstack/nova-multi-cell-exclude-list.txt
index d0a62e61aa36..a61229c90645 100644
--- a/devstack/nova-multi-cell-blacklist.txt
+++ b/devstack/nova-multi-cell-exclude-list.txt
@@ -1,4 +1,4 @@
-# --blacklist-file contents for the nova-multi-cell job defined in .zuul.yaml
+# --exclude-list contents for the nova-multi-cell job defined in .zuul.yaml
 # See: https://stestr.readthedocs.io/en/latest/MANUAL.html#test-selection
 
 # Exclude tempest.scenario.test_network tests since they are slow and