openstack
/
tempest
Code Issues Proposed changes

Merge "Set TOX_CONSTRAINTS_FILE"

This commit is contained in:
Zuul 2020-04-23 23:55:41 +00:00 committed by Gerrit Code Review
parent c4f38583ab 99b085bdb9
commit 4b471d664c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,8 @@
- name: Use stable branch upper-constraints till stable/rocky
set_fact:
tempest_tox_environment: "{{ tempest_tox_environment | combine({'UPPER_CONSTRAINTS_FILE': stable_constraints_file}) }}"
# 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"]
- name: Set OS_TEST_TIMEOUT if requested

4
tools/tempest-plugin-sanity.sh
View File

@ -60,8 +60,8 @@ function clone_project {
fi
}
: ${UPPER_CONSTRAINTS_FILE:="https://releases.openstack.org/constraints/upper/master"}
DEPS="-c${UPPER_CONSTRAINTS_FILE}"
: ${TOX_CONSTRAINTS_FILE:="https://releases.openstack.org/constraints/upper/master"}
DEPS="-c${TOX_CONSTRAINTS_FILE}"
# function to create virtualenv to perform sanity operation
function prepare_workspace {