Fix constraint usage for unmaintained/victoria|wallaby
vistoria and wallaby branches are renamed to unmaintained/ namespace. Fixing run-tempest role to adopt those new name for those branches so that it can set the correct constraints while installing the tempest. Change-Id: I595c3530461173fe3c9ba258aeb1ae90314874bf
This commit is contained in:
parent
c0da6e843a
commit
b42fc49058
@ -81,7 +81,7 @@ variable (through the `register` statement).
|
|||||||
.. zuul:rolevar:: stable_constraints_file
|
.. zuul:rolevar:: stable_constraints_file
|
||||||
:default: ''
|
: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
|
.. zuul:rolevar:: tempest_tox_environment
|
||||||
:default: ''
|
:default: ''
|
||||||
|
@ -25,11 +25,11 @@
|
|||||||
target_branch: "{{ zuul.override_checkout }}"
|
target_branch: "{{ zuul.override_checkout }}"
|
||||||
when: zuul.override_checkout is defined
|
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:
|
set_fact:
|
||||||
# TOX_CONSTRAINTS_FILE is new name, UPPER_CONSTRAINTS_FILE is old one, best to set both
|
# 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}) }}"
|
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
|
- name: Use Configured upper-constraints for non-master Tempest
|
||||||
set_fact:
|
set_fact:
|
||||||
@ -87,7 +87,7 @@
|
|||||||
exclude_list_option: "--blacklist-file={{ tempest_test_exclude_list|quote }}"
|
exclude_list_option: "--blacklist-file={{ tempest_test_exclude_list|quote }}"
|
||||||
when:
|
when:
|
||||||
- tempest_test_exclude_list is defined
|
- 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
|
# 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
|
# to tempest_exclude_regex option, until then it's kept here for the backward
|
||||||
@ -105,7 +105,7 @@
|
|||||||
when:
|
when:
|
||||||
- tempest_black_regex is not defined
|
- tempest_black_regex is not defined
|
||||||
- tempest_exclude_regex is 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
|
- 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
|
# NOTE(gmann): stable/train|ussuri|victoria use Tempest 26.1.0 and with stestr
|
||||||
@ -117,7 +117,7 @@
|
|||||||
when:
|
when:
|
||||||
- tempest_black_regex is not defined
|
- tempest_black_regex is not defined
|
||||||
- tempest_exclude_regex is 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
|
- name: Run Tempest
|
||||||
command: tox -e {{tox_envlist}} {{tox_extra_args}} -- \
|
command: tox -e {{tox_envlist}} {{tox_extra_args}} -- \
|
||||||
|
Loading…
Reference in New Issue
Block a user