updates for stable branch

Updates for stable branch including in-repo zuul config, bindep.txt,
etc.

Change-Id: Iec4acac323a6865c1aff3a9373cf9280a20717c9
This commit is contained in:
Boden R
2019-07-03 11:06:36 -06:00
parent a979cc40dc
commit ebaacab539
3 changed files with 44 additions and 19 deletions

View File

@@ -1,7 +1,5 @@
- project:
check:
jobs:
- openstack-tox-lower-constraints
gate:
jobs:
- openstack-tox-lower-constraints
templates:
- openstack-python-jobs
- openstack-python36-jobs
- check-requirements

30
bindep.txt Normal file
View File

@@ -0,0 +1,30 @@
# This file contains runtime (non-python) dependencies
# More info at: http://docs.openstack.org/infra/bindep/readme.html
# tools/misc-sanity-checks.sh validates .po[t] files
gettext [test]
# cffi (required by oslo.privsep) and PyNaCL (required by paramiko)
libffi-dev [platform:dpkg]
libffi-devel [platform:rpm]
# MySQL and PostgreSQL databases since some jobs are set up in
# OpenStack infra that need these like
# periodic-neutron-py27-with-oslo-master and
# periodic-neutron-py35-with-neutron-lib-master.
haproxy
libmysqlclient-dev [platform:dpkg test]
mysql [platform:rpm test]
mysql-client [platform:dpkg test]
mysql-devel [platform:rpm test]
mysql-server [test]
postgresql [test]
postgresql-client [platform:dpkg test]
postgresql-devel [platform:rpm test]
postgresql-server [platform:rpm test]
# Neutron's test-requirements requires tempest which requires paramiko
# which requires cryptography which requires ssl.
libssl-dev [platform:dpkg]
openssl-devel [platform:rpm !platform:suse]
libopenssl-devel [platform:suse !platform:rpm]

23
tox.ini
View File

@@ -1,5 +1,5 @@
[tox]
envlist = py35,py27,pep8,docs
envlist = py36,py27,pep8,docs
minversion = 2.0
skipsdist = True
@@ -9,7 +9,7 @@ setenv = VIRTUAL_ENV={envdir}
PYTHONWARNINGS=default::DeprecationWarning
passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
usedevelop = True
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals = sh
@@ -65,7 +65,7 @@ whitelist_externals =
bash
[testenv:bandit]
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky}
-r{toxinidir}/test-requirements.txt
commands = bandit -r vmware_nsxlib -n 5 -ll
@@ -80,17 +80,21 @@ commands = {posargs}
[testenv:docs]
basepython = python3
commands = sphinx-build -W -b html doc/source doc/build/html
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/rocky}
-r{toxinidir}/requirements.txt
commands = sphinx-build -b html doc/source doc/build/html
[flake8]
# E125 continuation line does not distinguish itself from next logical line
# E129 visually indented line with same indent as next logical line
# E741 ambiguous variable name
# N530 direct neutron imports not allowed
# W504 line break after binary operator
# N531 translations hints
ignore = N530,E125,E129,N531
ignore = N530,E125,E129,E741,N531,W504
show-source = true
builtins = _
exclude = build,dist
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject
import-order-style = pep8
[hacking]
@@ -102,10 +106,3 @@ commands =
[testenv:uuidgen]
commands =
check-uuid --fix
[testenv:lower-constraints]
basepython = python3
deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt