Only add tempest/tempestconf git constraints *_git_repo is defined
For stable branches we want the version of tempest to be set by upper constraints, rather than use a git source. To make this work, we only set the git sourced constraint if tempest_git_repo or tempest_tempestconf_git_repo is defined. Needed-By: I88160984f2a429b22e33cc5f674670818fa41479 Change-Id: I1a793b5ddf2b027403fcddd8b2b5501cf847dd1d
This commit is contained in:
parent
f5b0074c68
commit
e8c939af60
|
@ -47,7 +47,7 @@ tempest_run: no
|
|||
tempest_git_install_branch: master
|
||||
tempest_upper_constraints_url: "{{ requirements_git_url | default('https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=' ~ requirements_git_install_branch | default('master')) }}"
|
||||
tempest_git_constraints:
|
||||
- "git+{{ tempest_git_repo }}@{{ tempest_git_install_branch }}#egg=tempest"
|
||||
- "{{ (tempest_git_repo is defined) | ternary('git+' ~ (tempest_git_repo | default('https://git.openstack.org/openstack/tempest')) ~ '@' ~ tempest_git_install_branch ~ '#egg=tempest', '') }}"
|
||||
- "--constraint {{ tempest_upper_constraints_url }}"
|
||||
|
||||
tempest_pip_install_args: "{{ pip_install_options | default('') }}"
|
||||
|
@ -318,7 +318,7 @@ tempest_tempestconf_venv_bin: "/openstack/venvs/tempestconf/bin"
|
|||
# tempest_tempestconf_git_repo: https://git.openstack.org/openstack/python-tempestconf
|
||||
tempest_tempestconf_git_install_branch: master
|
||||
tempest_tempestconf_git_constraints:
|
||||
- "git+{{ tempest_tempestconf_git_repo }}@{{ tempest_tempestconf_git_install_branch }}#egg=python_tempestconf"
|
||||
- "{{ (tempest_tempestconf_git_repo is defined) | ternary('git+' ~ (tempest_tempestconf_git_repo | default('https://git.openstack.org/openstack/python-tempestconf')) ~ '@' ~ tempest_tempestconf_git_install_branch ~ '#egg=python_tempestconf', '') }}"
|
||||
- "--constraint {{ tempest_upper_constraints_url }}"
|
||||
tempest_tempestconf_pip_packages:
|
||||
- python-tempestconf
|
||||
|
|
Loading…
Reference in New Issue