Skip to content

Commit 753c30f

Browse files
committed
diskimage-create: Fix tox.ini not compatible with tox 4.x
Change-Id: I24e1a7059c7ed1bdfe0f287c81148db912ce52a9
1 parent 05616ab commit 753c30f

File tree

1 file changed

+30
-13
lines changed

1 file changed

+30
-13
lines changed

diskimage-create/tox.ini

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,53 @@
11
[tox]
2-
minversion = 1.8
2+
minversion = 3.18
33
envlist = bashate,docs,build,test
4-
skipsdist = True
54

65
[testenv]
76
basepython = python3
87
envdir = {toxworkdir}/venv
98
setenv = VIRTUAL_ENV={envdir}
10-
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY DIB_* CLOUD_INIT_DATASOURCES OCTAVIA_REPO_PATH
9+
passenv =
10+
http_proxy
11+
HTTP_PROXY
12+
https_proxy
13+
HTTPS_PROXY
14+
no_proxy
15+
NO_PROXY
16+
DIB_*
17+
CLOUD_INIT_DATASOURCES
18+
OCTAVIA_REPO_PATH
1119
install_command = pip install -U {opts} {packages}
1220
deps = -r{toxinidir}/requirements.txt
1321
-r{toxinidir}/test-requirements.txt
14-
whitelist_externals = virt-filesystems
15-
virt-inspector
16-
awk
17-
mkdir
18-
rm
22+
allowlist_externals =
23+
virt-filesystems
24+
virt-inspector
25+
awk
26+
mkdir
27+
rm
1928

2029
[testenv:docs]
2130
commands = doc8 README.rst ../elements/haproxy-octavia/README.rst ../elements/root-passwd/README.rst
2231

2332
[testenv:bashate]
24-
commands = bashate diskimage-create.sh
25-
bashate image-tests.sh
33+
commands =
34+
bashate diskimage-create.sh
35+
bashate image-tests.sh
2636

2737
[testenv:build]
2838
# NOTE: specify cache directory explicitly with -c as the `diskimage-create.sh`
2939
# default is based off of `$HOME` which is not passed on in a `tox` environment.
30-
commands = ./diskimage-create.sh -o {toxinidir}/amphora-x64-haproxy -w {toxworkdir} -c {toxworkdir}/.cache
40+
commands =
41+
./diskimage-create.sh -o {toxinidir}/amphora-x64-haproxy -w {toxworkdir} -c {toxworkdir}/.cache
42+
allowlist_externals =
43+
./diskimage-create.sh
44+
3145

3246
[testenv:test]
3347
# Work around tox limitations with command pipes
3448
# https://bitbucket.org/hpk42/tox/issue/73/pipe-output-of-command-into-file
35-
commands = ./image-tests.sh {toxinidir}/.amp_tox_test
36-
rm -rf {toxinidir}/.amp_tox_test
49+
commands =
50+
./image-tests.sh {toxinidir}/.amp_tox_test
51+
rm -rf {toxinidir}/.amp_tox_test
52+
allowlist_externals =
53+
./image-tests.sh

0 commit comments

Comments
 (0)