Merge "Allow use custom uppper constraints in stable/stein"
This commit is contained in:
commit
76f63460b3
@ -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/rocky.
|
Upper constraints file to be used for stable branch till stable/stein.
|
||||||
|
|
||||||
.. 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/rocky
|
- name: Use stable branch upper-constraints till stable/stein
|
||||||
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"]
|
when: target_branch in ["stable/ocata", "stable/pike", "stable/queens", "stable/rocky", "stable/stein"]
|
||||||
|
|
||||||
- name: Set OS_TEST_TIMEOUT if requested
|
- name: Set OS_TEST_TIMEOUT if requested
|
||||||
set_fact:
|
set_fact:
|
||||||
|
Loading…
Reference in New Issue
Block a user