Add support for ussuri
This adds support for the stable ussuri branch. Change-Id: I97e60937e43a5544790adaee90e572fe51ca02de
This commit is contained in:
Thomas Bachman
parent
f2ceef2e4c
commit
bc3bba7fc3
24
.zuul.yaml
24
.zuul.yaml
|
|
@ -14,34 +14,42 @@
|
|||
- openstack-tox-pep8:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/train
|
||||
override-checkout: stable/ussuri
|
||||
- openstack-tox-py27:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/train
|
||||
override-checkout: stable/ussuri
|
||||
- openstack-tox-py35:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/ussuri
|
||||
- openstack-tox-py36:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/train
|
||||
override-checkout: stable/ussuri
|
||||
- openstack-tox-py37:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/train
|
||||
override-checkout: stable/ussuri
|
||||
gate:
|
||||
jobs:
|
||||
- openstack-tox-pep8:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/train
|
||||
override-checkout: stable/ussuri
|
||||
- openstack-tox-py27:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/train
|
||||
override-checkout: stable/ussuri
|
||||
- openstack-tox-py35:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/ussuri
|
||||
- openstack-tox-py36:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/train
|
||||
override-checkout: stable/ussuri
|
||||
- openstack-tox-py37:
|
||||
required-projects:
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/train
|
||||
override-checkout: stable/ussuri
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
pbr>=2.0.0,!=2.1.0 # Apache-2.0
|
||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||
python-heatclient>=1.10.0 # Apache-2.0
|
||||
python-neutronclient>=6.7.0 # Apache-2.0
|
||||
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
||||
|
|
|
|||
|
|
@ -14,8 +14,9 @@ classifier =
|
|||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: POSIX :: Linux
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 2
|
||||
Programming Language :: Python :: 2.7
|
||||
Programming Language :: Python :: 3
|
||||
Programming Language :: Python :: 3.6
|
||||
Programming Language :: Python :: 3.7
|
||||
|
||||
[files]
|
||||
packages =
|
||||
|
|
|
|||
2
setup.py
2
setup.py
|
|
@ -26,5 +26,5 @@ except ImportError:
|
|||
pass
|
||||
|
||||
setuptools.setup(
|
||||
setup_requires=['pbr>=1.8'],
|
||||
setup_requires=['pbr>=2.0.0'],
|
||||
pbr=True)
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
hacking>=1.1.0 # Apache-2.0
|
||||
hacking>=3.0.1,<3.1.0;python_version!='2.7' # Apache-2.0
|
||||
hacking!=0.13.0,<0.14,>=0.12.0;python_version=='2.7' # Apache-2.0
|
||||
|
||||
bandit!=1.6.0,>=1.1.0 # Apache-2.0
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
flake8-import-order==0.12 # LGPLv3
|
||||
httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
mock>=2.0.0 # BSD
|
||||
oslotest>=3.2.0,<=3.9.0 # Apache-2.0
|
||||
python-openstackclient>=3.12.0 # Apache-2.0
|
||||
sphinx!=1.6.6,>=1.6.2 # BSD
|
||||
oslosphinx>=4.7.0 # Apache-2.0
|
||||
|
|
|
|||
11
tox.ini
11
tox.ini
|
|
@ -1,9 +1,11 @@
|
|||
[tox]
|
||||
envlist = py27,py37,pypy,pep8
|
||||
envlist = py36,py37,py27,pep8
|
||||
minversion = 2.3.2
|
||||
skipsdist = True
|
||||
ignore_basepython_conflict = True
|
||||
|
||||
[testenv]
|
||||
basepython = python3
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
LANG=en_US.UTF-8
|
||||
LANGUAGE=en_US:en
|
||||
|
|
@ -11,36 +13,31 @@ setenv = VIRTUAL_ENV={envdir}
|
|||
usedevelop = True
|
||||
install_command = pip install {opts} {packages}
|
||||
deps =
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = stestr run {posargs}
|
||||
|
||||
[testenv:pep8]
|
||||
basepython = python3
|
||||
commands =
|
||||
flake8
|
||||
{[testenv:bandit]commands}
|
||||
distribute = false
|
||||
|
||||
[testenv:venv]
|
||||
basepython = python3
|
||||
commands = {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
basepython = python3
|
||||
commands =
|
||||
coverage erase
|
||||
coverage run -m testtools.run
|
||||
coverage report --include="*gbpclient*" --omit="*test*" --omit="*.tox*" --omit="*nfp*" -m
|
||||
|
||||
[testenv:docs]
|
||||
basepython = python3
|
||||
commands=
|
||||
sphinx-build -W -b html doc/source doc/build/html
|
||||
|
||||
[testenv:bandit]
|
||||
basepython = python3
|
||||
# B303: blacklist calls: md5, sha1
|
||||
# B112: Test for a continue in the except block
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
|
|
|
|||
Loading…
Reference in New Issue