Import and update jobs
Import jobs from project-config and update them: * Use python36 instead of python35, since py35 is out of scope for current cycle. * Switch to using "tox -e docs" for docs building - using build-openstack-docs-pti template. This does not publish since networking-l2gw is not an official OpenStack project under governance anymore. Update tox.ini for docs change. Since this now uses python3 for docs building, switch from oslosphinx (only working with python2) to openstackdocstheme. Use new URL for upper-constraints file everywhere. Update RST files where new sphinx was producing errors. Needed-By: https://review.opendev.org/661542 Change-Id: Ic59f532e31647bc58aba236bf440b7bca934d36dstable/train
parent
4aaadd1c3d
commit
aed091ab45
|
@ -1,4 +1,9 @@
|
|||
- project:
|
||||
templates:
|
||||
- check-requirements
|
||||
- openstack-python-jobs-neutron
|
||||
- openstack-python36-jobs-neutron
|
||||
- build-openstack-docs-pti
|
||||
check:
|
||||
jobs:
|
||||
- networking-l2gw-tempest-dummy
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
# 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.
|
||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
|
||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
|
||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
|
@ -23,9 +23,15 @@ sys.path.insert(0, os.path.abspath('../..'))
|
|||
extensions = [
|
||||
'sphinx.ext.autodoc',
|
||||
#'sphinx.ext.intersphinx',
|
||||
'oslosphinx'
|
||||
'openstackdocstheme'
|
||||
]
|
||||
|
||||
# openstackdocstheme options
|
||||
repository_name = 'openstack/networking-l2gw'
|
||||
bug_project = 'networking-l2gw'
|
||||
bug_tag = ''
|
||||
html_theme = 'openstackdocs'
|
||||
|
||||
# autodoc generation is a bit aggressive and a nuisance when doing heavy
|
||||
# text edit cycles.
|
||||
# execute "export SPHINX_DEBUG=1" in your terminal to disable
|
||||
|
|
|
@ -18,9 +18,9 @@ single broadcast domain. A typical use case is bridging the virtual with the phy
|
|||
|
||||
L2GW introduces a various models to describe the relationships between logical and the physical entities.
|
||||
|
||||
========================= ====================================================================
|
||||
========================= =====================================================================
|
||||
Models Description
|
||||
========================= ====================================================================
|
||||
========================= =====================================================================
|
||||
l2gateways logical gateways that represents for the set of physical devices
|
||||
l2gatewaydevices l2 gateway devices that represents for logical gateways.
|
||||
l2gatewayinterfaces it represents the physical ports for the devices
|
||||
|
@ -115,7 +115,7 @@ L2 Gateway Agent connects to ovsdb server to configure and fetch L2 Gateways
|
|||
:width: 450px
|
||||
:align: center
|
||||
|
||||
.. _l2gw_release_management
|
||||
.. _l2gw_release_management:
|
||||
|
||||
6. L2GW Package Versioning and Release Management
|
||||
=================================================
|
||||
|
|
|
@ -7,11 +7,8 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
|||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
flake8-import-order==0.12 # LGPLv3
|
||||
python-subunit>=1.0.0 # Apache-2.0/BSD
|
||||
sphinx>=1.6.5,!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD
|
||||
sphinx>=1.6.5,!=1.6.6,!=1.6.7;python_version>='3.4' # BSD
|
||||
psycopg2>=2.7.5 # LGPL/ZPL
|
||||
PyMySQL>=0.7.6 # MIT License
|
||||
oslosphinx>=4.7.0 # Apache-2.0
|
||||
oslotest>=3.2.0 # Apache-2.0
|
||||
os-testr>=1.0.0 # Apache-2.0
|
||||
requests-mock>=1.2.0 # Apache-2.0
|
||||
|
|
9
tox.ini
9
tox.ini
|
@ -1,5 +1,5 @@
|
|||
[tox]
|
||||
envlist = py35,py34,py27,pep8
|
||||
envlist = py36,py35,py34,py27,pep8
|
||||
minversion = 2.0
|
||||
skipsdist = True
|
||||
|
||||
|
@ -9,7 +9,7 @@ setenv =
|
|||
PYTHONWARNINGS=default::DeprecationWarning
|
||||
usedevelop = True
|
||||
install_command = pip install {opts} {packages}
|
||||
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/master}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
whitelist_externals = *
|
||||
|
@ -36,7 +36,10 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
|
|||
|
||||
[testenv:docs]
|
||||
basepython = python3
|
||||
commands = python setup.py build_sphinx
|
||||
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/doc/requirements.txt
|
||||
commands = sphinx-build -W -d doc/build/doctrees -b html doc/source doc/build/html
|
||||
|
||||
|
||||
[flake8]
|
||||
# H803 skipped on purpose per list discussion.
|
||||
|
|
Loading…
Reference in New Issue