openstack
/
tempest
Code Issues Proposed changes

Merge "Fix constraint usage for unmaintained/victoria|wallaby"

This commit is contained in:
Zuul 2024-04-30 11:42:30 +00:00 committed by Gerrit Code Review
parent 1c3fc43c9d b42fc49058
commit 550784f306
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/run-tempest/README.rst
View File

@ -81,7 +81,7 @@ variable (through the `register` statement).
.. zuul:rolevar:: stable_constraints_file
:default: ''
Upper constraints file to be used for stable branch till stable/victoria.
Upper constraints file to be used for stable branch till Wallaby
.. zuul:rolevar:: tempest_tox_environment
:default: ''

10
roles/run-tempest/tasks/main.yaml
View File

@ -25,11 +25,11 @@
target_branch: "{{ zuul.override_checkout }}"
when: zuul.override_checkout is defined
- name: Use stable branch upper-constraints till stable/wallaby
- name: Use stable branch upper-constraints till Wallaby
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", "stable/ussuri", "stable/victoria", "stable/wallaby"]
when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein", "stable/train", "stable/ussuri", "unmaintained/victoria", "unmaintained/wallaby"]
- name: Use Configured upper-constraints for non-master Tempest
set_fact:
@ -87,7 +87,7 @@
exclude_list_option: "--blacklist-file={{ tempest_test_exclude_list|quote }}"
when:
- tempest_test_exclude_list is defined
- target_branch in ["stable/train", "stable/ussuri", "stable/victoria"]
- target_branch in ["stable/train", "stable/ussuri", "unmaintained/victoria"]
# 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,7 +105,7 @@
when:
- tempest_black_regex is not defined
- tempest_exclude_regex is defined
- target_branch not in ["stable/train", "stable/ussuri", "stable/victoria"]
- target_branch not in ["stable/train", "stable/ussuri", "unmaintained/victoria"]
- name: Tempest 26.1.0 workaround to fallback exclude-regex to black-regex
# NOTE(gmann): stable/train|ussuri|victoria use Tempest 26.1.0 and with stestr
@ -117,7 +117,7 @@
when:
- tempest_black_regex is not defined
- tempest_exclude_regex is defined
- target_branch in ["stable/train", "stable/ussuri", "stable/victoria"]
- target_branch in ["stable/train", "stable/ussuri", "unmaintained/victoria"]
- name: Run Tempest
command: tox -e {{tox_envlist}} {{tox_extra_args}} -- \