Adapt to tox 4
tox 4 introduced some changes which broke compatibility. This updates tox.ini to adopt the change. This also replaces usage of upstream docker package by one provided by distro, assuming that is more stable. Change-Id: I511c5b657386877c6ae3eed57a2e345c6a9e2d70
This commit is contained in:
parent
9256bd59bf
commit
e9187da3ea
@ -140,10 +140,15 @@ function configure_swift_and_keystone_for_storlets {
|
||||
}
|
||||
|
||||
function _install_docker {
|
||||
# Install apparmor to workaround
|
||||
# https://github.com/moby/moby/issues/44900
|
||||
if is_ubuntu; then
|
||||
install_package apparmor
|
||||
fi
|
||||
|
||||
# TODO: Add other dirstors.
|
||||
# This one is geared towards Ubuntu
|
||||
# See other projects that install docker
|
||||
|
||||
wget http://get.docker.com -O install_docker.sh
|
||||
chmod 755 install_docker.sh
|
||||
sudo bash -x install_docker.sh
|
||||
|
5
tox.ini
5
tox.ini
@ -1,13 +1,11 @@
|
||||
[tox]
|
||||
minversion = 3.18.0
|
||||
envlist = py36,py38,py39,pep8
|
||||
skipsdist = True
|
||||
ignore_basepython_conflict = True
|
||||
|
||||
|
||||
[testenv]
|
||||
basepython = python3
|
||||
usedevelop = True
|
||||
setenv =
|
||||
VIRTUAL_ENV={envdir}
|
||||
PYTHONPATH={toxinidir}/StorletSamples/python:{envdir}
|
||||
@ -26,7 +24,6 @@ commands =
|
||||
allowlist_externals =
|
||||
bash
|
||||
find
|
||||
rm
|
||||
|
||||
[testenv:pep8python]
|
||||
commands =
|
||||
@ -41,7 +38,7 @@ setenv =
|
||||
VIRTUAL_ENV={envdir}
|
||||
STORLET_SAMPLE_PATH={toxinidir}/StorletSamples
|
||||
CLUSTER_CONF_DIR={toxinidir}
|
||||
commands = {toxinidir}/.functests jenkins
|
||||
commands = bash -c "{toxinidir}/.functests jenkins"
|
||||
|
||||
[testenv:venv]
|
||||
commands = {posargs}
|
||||
|
Loading…
Reference in New Issue
Block a user