Merge "Remove the tox venv patcharm64"

[functest.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 81d5e28..9acfffe 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,14 @@
 [tox]
-envlist = docs,pep8,pylint,py35,py27,perm,aarch64
+envlist = docs,pep8,pylint,py35,py27,perm
 
 [testenv]
 usedevelop = True
 deps =
   -c{toxinidir}/upper-constraints.txt
-  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata
+  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-install_command = pip install {opts} {packages} requests===2.13.0
+install_command = pip install {opts} {packages}
 commands = nosetests --with-xunit \
   --with-coverage \
   --cover-tests \
@@ -59,12 +59,3 @@ commands =
     -exec ls -l \{\} + | grep '.' && exit 1 || exit 0"
   bash -c "\
     find {[testenv:perm]path} -exec file \{\} + | grep CRLF && exit 1 || exit 0"
-
-[testenv:aarch64]
-basepython = python2.7
-whitelist_externals =
-  bash
-  git
-commands =
-  bash -c "patch -f -p1 < docker/Dockerfile.aarch64.patch"
-  git checkout docker/Dockerfile