Merge "Use UPPER_CONSTRAINTS_FILE for stable/ussuri testing"
diff --git a/roles/run-tempest/tasks/main.yaml b/roles/run-tempest/tasks/main.yaml
index 397de1e..70c275b 100644
--- a/roles/run-tempest/tasks/main.yaml
+++ b/roles/run-tempest/tasks/main.yaml
@@ -25,11 +25,11 @@
target_branch: "{{ zuul.override_checkout }}"
when: zuul.override_checkout is defined
-- name: Use stable branch upper-constraints till stable/train
+- name: Use stable branch upper-constraints till stable/ussuri
set_fact:
# TOX_CONSTRAINTS_FILE is new name, UPPER_CONSTRAINTS_FILE is old one, best to set both
tempest_tox_environment: "{{ tempest_tox_environment | combine({'UPPER_CONSTRAINTS_FILE': stable_constraints_file}) | combine({'TOX_CONSTRAINTS_FILE': stable_constraints_file}) }}"
- when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein", "stable/train"]
+ when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein", "stable/train", "stable/ussuri"]
- name: Use Configured upper-constraints for non-master Tempest
set_fact:
@@ -78,16 +78,16 @@
exclude_list_option: "--exclude-list={{ tempest_test_exclude_list|quote }}"
when: exclude_list_stat.stat.exists
-- name: stable/train workaround to fallback exclude-list to blacklist
- # NOTE(gmann): stable/train use Tempest 26.1.0 and with stestr 2.5.1
- # (beacause of upper constraints of stestr 2.5.1 in stable/train) which
- # does not have new args exclude-list so let's fallback to old arg
+- name: Tempest 26.1.0 workaround to fallback exclude-list to blacklist
+ # NOTE(gmann): stable/train|ussuri use Tempest 26.1.0 and with stestr 2.5.1/3.0.1
+ # (beacause of upper constraints of stestr 2.5.1/3.0.1 in stable/train|ussuri)
+ # which does not have new args exclude-list so let's fallback to old arg
# if new arg is passed.
set_fact:
exclude_list_option: "--blacklist-file={{ tempest_test_exclude_list|quote }}"
when:
- tempest_test_exclude_list is defined
- - target_branch == "stable/train"
+ - target_branch in ["stable/train", "stable/ussuri"]
# TODO(kopecmartin) remove this after all consumers of the role have switched
# to tempest_exclude_regex option, until then it's kept here for the backward
@@ -105,19 +105,19 @@
when:
- tempest_black_regex is not defined
- tempest_exclude_regex is defined
- - target_branch != "stable/train"
+ - target_branch not in ["stable/train", "stable/ussuri"]
-- name: stable/train workaround to fallback exclude-regex to black-regex
- # NOTE(gmann): stable/train use Tempest 26.1.0 and with stestr 2.5.1
- # (beacause of upper constraints of stestr 2.5.1 in stable/train) which
- # does not have new args exclude-regex so let's fallback to old arg
+- name: Tempest 26.1.0 workaround to fallback exclude-regex to black-regex
+ # NOTE(gmann): stable/train|ussuri use Tempest 26.1.0 and with stestr 2.5.1/3.0.1
+ # (beacause of upper constraints of stestr 2.5.1/3.0.1 in stable/train|ussuri)
+ # which does not have new args exclude-list so let's fallback to old arg
# if new arg is passed.
set_fact:
tempest_test_exclude_regex: "--black-regex={{tempest_exclude_regex|quote}}"
when:
- tempest_black_regex is not defined
- tempest_exclude_regex is defined
- - target_branch == "stable/train"
+ - target_branch in ["stable/train", "stable/ussuri"]
- name: Run Tempest
command: tox -e {{tox_envlist}} {{tox_extra_args}} -- {{tempest_test_regex|quote}} \