summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml14
-rw-r--r--devstack/nova-multi-cell-exclude-list.txt (renamed from devstack/nova-multi-cell-blacklist.txt)2
2 files changed, 8 insertions, 8 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index f98e714b2e..a2d91ba6cb 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
index d0a62e61aa..a61229c906 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