Browse Source

Modernise tox.ini and run OSA metal jobs in CI

There was no coverage of an actual OSA deployment in CI, so we
add this. Also remove the legacy python3 functional test
and move all tox environments to be python3.

Change-Id: I36cee01b9a14adf1840d35c3a8934de8a994f399
changes/71/735871/1
Jonathan Rosser 3 weeks ago
parent
commit
802cafb7fd
2 changed files with 9 additions and 29 deletions
  1. +8
    -27
      tox.ini
  2. +1
    -2
      zuul.d/project.yaml

+ 8
- 27
tox.ini View File

@@ -1,13 +1,12 @@
[tox]
minversion = 2.0
minversion = 3.1
skipsdist = True
envlist = docs,linters,functional,func_py3
envlist = docs,linters,functional
ignore_basepython_conflict = True

[testenv]
usedevelop = True
install_command =
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
basepython = python3
commands =
/usr/bin/find . -type f -name "*.pyc" -delete
passenv =
@@ -36,8 +35,9 @@ setenv =


[testenv:docs]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt
deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt
commands =
bash -c "rm -rf doc/build"
doc8 doc
@@ -45,7 +45,6 @@ commands =


[testenv:pdf-docs]
basepython = python3
deps = {[testenv:docs]deps}
whitelist_externals =
make
@@ -60,21 +59,18 @@ extensions = .rst


[testenv:releasenotes]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt
deps = {[testenv:docs]deps}
commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html


# environment used by the -infra templated docs job
[testenv:venv]
basepython = python3
commands =
{posargs}


[testenv:pep8]
basepython = python3
commands =
bash -c "{toxinidir}/tests/common/test-pep8.sh"

@@ -85,38 +81,23 @@ commands =
# unable to detect undefined names
ignore=F403


[testenv:bashate]
basepython = python3
commands =
bash -c "{toxinidir}/tests/common/test-bashate.sh"


[testenv:ansible-syntax]
basepython = python3
commands =
bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"


[testenv:ansible-lint]
basepython = python3
commands =
bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"


[testenv:functional]
commands =
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"


[testenv:func_py3]
basepython = python3
commands =
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"


[testenv:linters]
basepython = python3
commands =
bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
{[testenv:pep8]commands}


+ 1
- 2
zuul.d/project.yaml View File

@@ -15,17 +15,16 @@
- project:
templates:
- openstack-ansible-role-jobs
- openstack-ansible-deploy-aio_metal-jobs
- check-requirements
- publish-openstack-docs-pti
- publish-to-pypi
- release-notes-jobs-python3
check:
jobs:
- openstack-ansible-python3-ubuntu-bionic
- tripleo-ci-centos-8-standalone
gate:
jobs:
- openstack-ansible-python3-ubuntu-bionic
- tripleo-ci-centos-8-standalone
post:
jobs:


Loading…
Cancel
Save