From a741bcea4f114af9e84a84870a9bb37df5557ba8 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Fri, 17 Sep 2021 16:11:44 +0000 Subject: [PATCH] Update TOX_CONSTRAINTS_FILE for stable/xena Update the URL to the upper-constraints file to point to the redirect rule on releases.openstack.org so that anyone working on this branch will switch to the correct upper-constraints list automatically when the requirements repository branches. Until the requirements repository has as stable/xena branch, tests will continue to use the upper-constraints list on master. Change-Id: I5791d335c70eb70af0f5a52190a60bb6da7dc951 --- elements/amphora-agent/source-repository-amphora-agent | 4 ++-- elements/octavia-lib/source-repository-octavia-lib | 2 +- tox.ini | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/elements/amphora-agent/source-repository-amphora-agent b/elements/amphora-agent/source-repository-amphora-agent index 53684a4761..29fe2479eb 100644 --- a/elements/amphora-agent/source-repository-amphora-agent +++ b/elements/amphora-agent/source-repository-amphora-agent @@ -1,3 +1,3 @@ # This is used for source-based builds -amphora-agent git /opt/amphora-agent https://opendev.org/openstack/octavia -upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt +amphora-agent git /opt/amphora-agent https://opendev.org/openstack/octavia stable/xena +upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/xena diff --git a/elements/octavia-lib/source-repository-octavia-lib b/elements/octavia-lib/source-repository-octavia-lib index 33694cbbb3..bb1da54da9 100644 --- a/elements/octavia-lib/source-repository-octavia-lib +++ b/elements/octavia-lib/source-repository-octavia-lib @@ -1,2 +1,2 @@ # This is used for source-based builds -octavia-lib git /opt/octavia-lib https://opendev.org/openstack/octavia-lib +octavia-lib git /opt/octavia-lib https://opendev.org/openstack/octavia-lib stable/xena diff --git a/tox.ini b/tox.ini index c2caa9cfdf..4bd0cf46ba 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir} install_command = pip install {opts} {packages} allowlist_externals = find -deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} +deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = @@ -23,7 +23,7 @@ commands = # This environment is called from CI scripts to test and publish # the API Ref to docs.openstack.org. deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt allowlist_externals = rm @@ -92,7 +92,7 @@ allowlist_externals = [testenv:docs] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt @@ -199,7 +199,7 @@ max-line-length = 79 [testenv:releasenotes] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} -r{toxinidir}/doc/requirements.txt allowlist_externals = rm commands =