openstack
/
octavia
Code Issues Proposed changes

Update TOX_CONSTRAINTS_FILE for stable/ussuri 

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/ussuri branch, tests will
continue to use the upper-constraints list on master.

Change-Id: I57a6834513a88b1569814b71595dba343eb3c847
This commit is contained in:
Sean McGinnis 2020-04-23 15:36:09 -05:00
parent 59b14eb73e
commit 0e5372fb3a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/amphora-agent/source-repository-amphora-agent
View File

@ -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/ussuri
upper-constraints file /opt/upper-constraints.txt https://releases.openstack.org/constraints/upper/ussuri

8
tox.ini
View File

@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
install_command =
pip install {opts} {packages}
whitelist_externals = find
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-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:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
whitelist_externals = rm
@ -83,7 +83,7 @@ whitelist_externals =
[testenv:docs]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt
@ -190,7 +190,7 @@ max-line-length = 79
[testenv:releasenotes]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
whitelist_externals = rm