Update tox.ini to work with tox 4

This change will allow this repo to pass zuul now
that this has merged:
https://review.opendev.org/c/zuul/zuul-jobs/+/866943

Tox 4 deprecated whitelist_externals.
Replace whitelist_externals with allowlist_externals

The Zuul directives file is pinning tox < 4 in order
for other zuul targets to continue to pass.

Locking the nodeset for most zuul jobs to focal

Note:
Unit tests have been known to be broken since:
https://review.opendev.org/c/starlingx/rook-ceph/+/820383

Therefore: disabling py27 and py39 for now.

Partial-Bug: #2000399

Signed-off-by: Al Bailey <al.bailey@windriver.com>
Change-Id: Ia7078efad47842eb949f4e86bcde2aa20ed8fce8
This commit is contained in:
Al Bailey 2022-12-27 01:25:23 +00:00
parent 960e10b510
commit 0cbfed082c
3 changed files with 20 additions and 7 deletions

View File

@ -1,18 +1,20 @@
---
- project:
vars:
ensure_tox_version: '<4'
check:
jobs:
- openstack-tox-linters
- k8sapp-rook-ceph-tox-py27
- k8sapp-rook-ceph-tox-py39
# - k8sapp-rook-ceph-tox-py27
# - k8sapp-rook-ceph-tox-py39
- k8sapp-rook-ceph-tox-flake8
- k8sapp-rook-ceph-tox-pylint
- k8sapp-rook-ceph-tox-bandit
gate:
jobs:
- openstack-tox-linters
- k8sapp-rook-ceph-tox-py27
- k8sapp-rook-ceph-tox-py39
# - k8sapp-rook-ceph-tox-py27
# - k8sapp-rook-ceph-tox-py39
- k8sapp-rook-ceph-tox-flake8
- k8sapp-rook-ceph-tox-pylint
- k8sapp-rook-ceph-tox-bandit
@ -61,6 +63,7 @@
parent: tox
description: |
Run flake8 test for k8sapp_rook_ceph
nodeset: ubuntu-focal
files:
- python-k8sapp-rook/*
vars:
@ -72,6 +75,7 @@
parent: tox
description: |
Run pylint test for k8sapp_rook_ceph
nodeset: ubuntu-focal
required-projects:
- starlingx/config
- starlingx/fault
@ -88,6 +92,7 @@
parent: tox
description: |
Run bandit test for k8sapp_rook_ceph
nodeset: ubuntu-focal
files:
- python-k8sapp-rook/*
vars:

View File

@ -19,7 +19,7 @@ basepython = python3
sitepackages = True
# tox is silly... these need to be separated by a newline....
whitelist_externals = bash
allowlist_externals = bash
find
install_command = pip install \

12
tox.ini
View File

@ -2,7 +2,6 @@
envlist = linters
minversion = 2.3
skipsdist = True
#sitepackages=False
[testenv]
install_command = pip install \
@ -18,7 +17,7 @@ setenv =
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals =
allowlist_externals =
bash
[testenv:bashate]
@ -48,3 +47,12 @@ description = Dummy environment to allow pylint to be run in subdir tox
[testenv:bandit]
basepython = python3
description = Dummy environment to allow bandit to be run in subdir tox
[testenv:bindep]
# Do not install any requirements. We want this to be fast and work even if
# system dependencies are missing, since it's used to tell you what system
# dependencies are missing! This also means that bindep must be installed
# separately, outside of the requirements files.
skip_install = True
deps = bindep
commands = bindep test