Clean up outdated configs in tox.ini and .zuul.yaml
Tests still have python2.7 configs remaining and some tests are named -debian, implying the old ones are for centos and can be removed. This commit removes the python2.7 and centos configs from tox and zuul. Test Plan: 1. PASS - Ran all tests in tox and verified if every test finished with the desired output. 2. PASS - Ran tests in zuul environment and checked if it was successfull. Story: 2010531 Task: 48385 Change-Id: I2de9ef82a86e2ce35a3f2a5824f5dac634d2bd1e Signed-off-by: Gustavo Pereira <gustavo.lyrapereira@windriver.com>
This commit is contained in:
parent
a45e26cfb7
commit
fe00700f58
33
.zuul.yaml
33
.zuul.yaml
|
@ -10,16 +10,12 @@
|
||||||
- stx-distcloud-client-tox-pep8
|
- stx-distcloud-client-tox-pep8
|
||||||
- stx-distcloud-client-tox-py39
|
- stx-distcloud-client-tox-py39
|
||||||
- stx-distcloud-client-tox-pylint
|
- stx-distcloud-client-tox-pylint
|
||||||
- stx-distcloud-client-tox-pep8-debian
|
|
||||||
- stx-distcloud-client-tox-pylint-debian
|
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-linters
|
- openstack-tox-linters
|
||||||
- stx-distcloud-client-tox-pep8
|
- stx-distcloud-client-tox-pep8
|
||||||
- stx-distcloud-client-tox-py39
|
- stx-distcloud-client-tox-py39
|
||||||
- stx-distcloud-client-tox-pylint
|
- stx-distcloud-client-tox-pylint
|
||||||
- stx-distcloud-client-tox-pep8-debian
|
|
||||||
- stx-distcloud-client-tox-pylint-debian
|
|
||||||
post:
|
post:
|
||||||
jobs:
|
jobs:
|
||||||
- stx-distcloud-client-upload-git-mirror
|
- stx-distcloud-client-upload-git-mirror
|
||||||
|
@ -28,8 +24,9 @@
|
||||||
name: stx-distcloud-client-tox-py39
|
name: stx-distcloud-client-tox-py39
|
||||||
parent: tox-py39
|
parent: tox-py39
|
||||||
description: Run py39 for distcloud-client
|
description: Run py39 for distcloud-client
|
||||||
nodeset: ubuntu-focal
|
nodeset: debian-bullseye
|
||||||
vars:
|
vars:
|
||||||
|
python_version: 3.9
|
||||||
tox_envlist: py39
|
tox_envlist: py39
|
||||||
tox_extra_args: -c distributedcloud-client/tox.ini
|
tox_extra_args: -c distributedcloud-client/tox.ini
|
||||||
|
|
||||||
|
@ -37,38 +34,20 @@
|
||||||
name: stx-distcloud-client-tox-pylint
|
name: stx-distcloud-client-tox-pylint
|
||||||
parent: tox
|
parent: tox
|
||||||
description: Run pylint for distcloud-client
|
description: Run pylint for distcloud-client
|
||||||
nodeset: ubuntu-focal
|
nodeset: debian-bullseye
|
||||||
vars:
|
|
||||||
tox_envlist: pylint
|
|
||||||
tox_extra_args: -c distributedcloud-client/tox.ini
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: stx-distcloud-client-tox-pylint-debian
|
|
||||||
parent: tox
|
|
||||||
description: Run pylint with py39 for distcloud-client
|
|
||||||
nodeset: ubuntu-focal
|
|
||||||
vars:
|
vars:
|
||||||
python_version: 3.9
|
python_version: 3.9
|
||||||
tox_envlist: pylint_Debian
|
tox_envlist: pylint
|
||||||
tox_extra_args: -c distributedcloud-client/tox.ini
|
tox_extra_args: -c distributedcloud-client/tox.ini
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: stx-distcloud-client-tox-pep8
|
name: stx-distcloud-client-tox-pep8
|
||||||
parent: tox
|
parent: tox
|
||||||
description: Run pep8 for distcloud-client
|
description: Run pep8 for distcloud-client
|
||||||
nodeset: ubuntu-bionic
|
nodeset: debian-bullseye
|
||||||
vars:
|
|
||||||
tox_envlist: pep8
|
|
||||||
tox_extra_args: -c distributedcloud-client/tox.ini
|
|
||||||
|
|
||||||
- job:
|
|
||||||
name: stx-distcloud-client-tox-pep8-debian
|
|
||||||
parent: tox
|
|
||||||
description: Run pep8 for py39 distcloud client
|
|
||||||
nodeset: ubuntu-focal
|
|
||||||
vars:
|
vars:
|
||||||
python_version: 3.9
|
python_version: 3.9
|
||||||
tox_envlist: pep8_Debian
|
tox_envlist: pep8
|
||||||
tox_extra_args: -c distributedcloud-client/tox.ini
|
tox_extra_args: -c distributedcloud-client/tox.ini
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 2.3
|
minversion = 2.3
|
||||||
envlist = py27,py36,py39,pep8,pylint,pep8_Debian,pylint_Debian
|
envlist = py39,pep8,pylint
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
toxworkdir = /tmp/{env:USER}_dc_client_tox
|
toxworkdir = /tmp/{env:USER}_dc_client_tox
|
||||||
|
@ -9,71 +9,35 @@ toxworkdir = /tmp/{env:USER}_dc_client_tox
|
||||||
client_base_dir = .
|
client_base_dir = .
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
basepython = python3.9
|
||||||
install_command = pip install \
|
install_command = pip install \
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
|
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
|
||||||
{opts} {packages}
|
{opts} {packages}
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
OS_STDOUT_CAPTURE=1
|
OS_STDOUT_CAPTURE=1
|
||||||
OS_STDERR_CAPTURE=1
|
OS_STDERR_CAPTURE=1
|
||||||
OS_TEST_TIMEOUT=60
|
OS_TEST_TIMEOUT=60
|
||||||
# DISCOVER_DIRECTORY=dcmanagerclient/tests
|
|
||||||
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements-debian.txt
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
allowlist_externals =
|
allowlist_externals =
|
||||||
rm
|
rm
|
||||||
find
|
find
|
||||||
reno
|
reno
|
||||||
|
|
||||||
[testenv:py27]
|
|
||||||
basepython = python2.7
|
|
||||||
commands =
|
|
||||||
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
|
||||||
stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}'
|
|
||||||
|
|
||||||
[testenv:py36]
|
|
||||||
basepython = python3.6
|
|
||||||
commands =
|
|
||||||
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
|
||||||
stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}'
|
|
||||||
|
|
||||||
[testenv:py39]
|
[testenv:py39]
|
||||||
skipdist = False
|
skipdist = False
|
||||||
basepython = python3.9
|
|
||||||
install_command = pip install \
|
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/victoria/upper-constraints.txt} \
|
|
||||||
{opts} {packages}
|
|
||||||
commands =
|
commands =
|
||||||
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
||||||
stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}'
|
stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}'
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
deps = {[testenv]deps}
|
|
||||||
commands = flake8 {posargs}
|
|
||||||
|
|
||||||
[testenv:pep8_Debian]
|
|
||||||
basepython = python3.9
|
|
||||||
deps = -r{toxinidir}/test-requirements-debian.txt
|
deps = -r{toxinidir}/test-requirements-debian.txt
|
||||||
install_command = pip install -v -v -v \
|
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
|
|
||||||
{opts} {packages}
|
|
||||||
commands = flake8
|
commands = flake8
|
||||||
|
|
||||||
[testenv:pylint]
|
[testenv:pylint]
|
||||||
basepython = python3
|
|
||||||
sitepackages = False
|
|
||||||
deps = {[testenv]deps}
|
|
||||||
commands =
|
|
||||||
pylint {posargs} dcmanagerclient --rcfile=./pylint.rc
|
|
||||||
|
|
||||||
[testenv:pylint_Debian]
|
|
||||||
basepython = python3.9
|
|
||||||
deps = -r{toxinidir}/test-requirements-debian.txt
|
deps = -r{toxinidir}/test-requirements-debian.txt
|
||||||
install_command = pip install -v -v -v \
|
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
|
|
||||||
{opts} {packages}
|
|
||||||
commands =
|
commands =
|
||||||
pylint {posargs} dcmanagerclient --rcfile=./pylint.rc
|
pylint {posargs} dcmanagerclient --rcfile=./pylint.rc
|
||||||
|
|
||||||
|
@ -82,33 +46,11 @@ basepython = python3
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
|
||||||
setenv =
|
|
||||||
PYTHON=coverage run --parallel-mode
|
|
||||||
PYTHONDONTWRITEBYTECODE=True
|
|
||||||
|
|
||||||
deps = {[testenv]deps}
|
|
||||||
coverage
|
|
||||||
|
|
||||||
commands =
|
|
||||||
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
|
||||||
coverage erase
|
|
||||||
stestr --test-path={[dcclient]client_base_dir}/dcmanagerclient/tests run '{posargs}'
|
|
||||||
coverage combine
|
|
||||||
coverage html -d cover
|
|
||||||
coverage xml -o cover/coverage.xml
|
|
||||||
coverage report
|
|
||||||
|
|
||||||
[testenv:cover_Debian]
|
|
||||||
basepython = python3.9
|
|
||||||
setenv =
|
setenv =
|
||||||
PYTHON=coverage run --parallel-mode
|
PYTHON=coverage run --parallel-mode
|
||||||
PYTHONDONTWRITEBYTECODE=True
|
PYTHONDONTWRITEBYTECODE=True
|
||||||
deps = -r{toxinidir}/test-requirements-debian.txt
|
deps = -r{toxinidir}/test-requirements-debian.txt
|
||||||
coverage
|
coverage
|
||||||
install_command = pip install -v -v -v \
|
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
|
|
||||||
{opts} {packages}
|
|
||||||
commands =
|
commands =
|
||||||
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
|
||||||
coverage erase
|
coverage erase
|
||||||
|
|
Loading…
Reference in New Issue