From 8f522c5a60e096a1e02b2ddbf3b597bd6c8ae024 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 14 May 2020 17:22:57 +0200 Subject: [PATCH] Update constraints handling 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 --- roles/generate-tempestconf-file-cloud/tasks/main.yaml | 2 +- roles/generate-tempestconf-file/tasks/main.yaml | 2 +- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/generate-tempestconf-file-cloud/tasks/main.yaml b/roles/generate-tempestconf-file-cloud/tasks/main.yaml index 1aea2aa5..edf32e41 100644 --- a/roles/generate-tempestconf-file-cloud/tasks/main.yaml +++ b/roles/generate-tempestconf-file-cloud/tasks/main.yaml @@ -23,7 +23,7 @@ set -ex export PATH=$PATH:/usr/local/sbin:/usr/sbin 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: chdir: "{{ tempestconf_src_relative_path }}" executable: /bin/bash diff --git a/roles/generate-tempestconf-file/tasks/main.yaml b/roles/generate-tempestconf-file/tasks/main.yaml index ad8dbfcb..99093e5a 100644 --- a/roles/generate-tempestconf-file/tasks/main.yaml +++ b/roles/generate-tempestconf-file/tasks/main.yaml @@ -26,7 +26,7 @@ set -ex export PATH=$PATH:/usr/local/sbin:/usr/sbin 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: chdir: "{{ tempestconf_src_relative_path }}" executable: /bin/bash diff --git a/tox.ini b/tox.ini index 1373a769..3ca14212 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ ignore_basepython_conflict = true [testenv] basepython = python3 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 = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning