Browse Source

Consume networking-sfc stein b1

As of now, due to bug 1817555, networking-sfc code cannot be pulled
from the master branch even if we specify it in 'required-projects'.
As a workaround, this commit specifies networking-sfc stein b1
in requirements.txt (and lower-constraints.txt accordingly) like
what was done in https://review.openstack.org/#/c/639363/

This is likely a better short term solution than moving those
requirements into their own file as we did in
https://review.openstack.org/#/c/638099/

Change-Id: I286b49875416b2e44162b39cd156a954db688ebd
changes/62/639662/1
Boden R 2 years ago
parent
commit
18486a064d
4 changed files with 5 additions and 8 deletions
  1. +1
    -0
      lower-constraints.txt
  2. +4
    -2
      requirements.txt
  3. +0
    -4
      sibling-requirements.txt
  4. +0
    -2
      tox.ini

+ 1
- 0
lower-constraints.txt View File

@ -55,6 +55,7 @@ msgpack-python==0.4.0
munch==2.1.0
netaddr==0.7.18
netifaces==0.10.4
networking-sfc==8.0.0.0b1
neutron-lib==1.20.0
openstackdocstheme==1.18.1
openstacksdk==0.11.2


+ 4
- 2
requirements.txt View File

@ -43,8 +43,10 @@ oslo.upgradecheck>=0.1.1 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
sqlalchemy-migrate>=0.11.0 # Apache-2.0
# Uncomment or copy/paste the sibling requirements for release of project
# -r ./sibling-requirements.txt
# These repos are installed from git in OpenStack CI if the job
# configures them as required-projects:
neutron>=12.0.0 # Apache-2.0
networking-sfc>=8.0.0.0b1 # Apache-2.0
# The comment below indicates this project repo is current with neutron-lib
# and should receive neutron-lib consumption patches as they are released


+ 0
- 4
sibling-requirements.txt View File

@ -1,4 +0,0 @@
# These repos are installed from git in OpenStack CI if the job
# configures them as required-projects:
neutron>=12.0.0 # Apache-2.0
networking-sfc>=6.0.0 # Apache-2.0

+ 0
- 2
tox.ini View File

@ -10,7 +10,6 @@ passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS
usedevelop = True
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/sibling-requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals =
sh
@ -68,7 +67,6 @@ deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
-r{toxinidir}/sibling-requirements.txt
[flake8]
show-source = True


Loading…
Cancel
Save