openinfra/python-tempestconf
Code Issues Proposed changes

Update constraints handling

Browse Source 
Add requirements repo as required repo that is checked out on the
correct branch and use it for upper-constraints.txt file.
This allows depends-on to work with constraints.

Use also TOX_CONSTRAINTS_FILE as UPPER_CONSTRAINTS_FILE is obsolete.

Change-Id: I9e33e590b541dd524cbb4d5ec303c55a15ff141f
This commit is contained in:
Andreas Jaeger 2020-05-14 17:22:57 +02:00
parent 6f8d69f403
commit 8f522c5a60
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/generate-tempestconf-file-cloud/tasks/main.yaml
View File

@ -23,7 +23,7 @@
set -ex set -ex
export PATH=$PATH:/usr/local/sbin:/usr/sbin export PATH=$PATH:/usr/local/sbin:/usr/sbin
source {{ virtualenvs.tempestconf }}/bin/activate source {{ virtualenvs.tempestconf }}/bin/activate
pip install -c https://opendev.org/openstack/requirements/raw/branch/{{ branch }}/upper-constraints.txt . pip install -c {{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt .
args: args:
chdir: "{{ tempestconf_src_relative_path }}" chdir: "{{ tempestconf_src_relative_path }}"
executable: /bin/bash executable: /bin/bash

2
roles/generate-tempestconf-file/tasks/main.yaml
View File

@ -26,7 +26,7 @@
set -ex set -ex
export PATH=$PATH:/usr/local/sbin:/usr/sbin export PATH=$PATH:/usr/local/sbin:/usr/sbin
source {{ virtualenvs.tempestconf }}/bin/activate source {{ virtualenvs.tempestconf }}/bin/activate
pip install -c https://opendev.org/openstack/requirements/raw/branch/{{ branch }}/upper-constraints.txt . pip install -c {{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt .
args: args:
chdir: "{{ tempestconf_src_relative_path }}" chdir: "{{ tempestconf_src_relative_path }}"
executable: /bin/bash executable: /bin/bash

2
tox.ini
View File

@ -9,7 +9,7 @@ ignore_basepython_conflict = true
[testenv] [testenv]
basepython = python3 basepython = python3
usedevelop = True usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning PYTHONWARNINGS=default::DeprecationWarning