X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=62eaf00451f36b6df0541901d7e4ce7fceceade7;hb=refs%2Fchanges%2F79%2F47179%2F1;hp=9fc18b39fe022ee9f710f994d0c0ec415b5d6960;hpb=671b3356e8fc7c6219919f978a3dee6b69e8c663;p=functest.git

diff --git a/tox.ini b/tox.ini
index 9fc18b39f..62eaf0045 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +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/pike
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
-install_command = pip install \
-  -c{toxinidir}/upper-constraints.txt \
-  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata \
-  {opts} {packages}
+install_command = pip install {opts} {packages}
 commands = nosetests --with-xunit \
   --with-coverage \
   --cover-tests \
@@ -61,11 +60,10 @@ commands =
   bash -c "\
     find {[testenv:perm]path} -exec file \{\} + | grep CRLF && exit 1 || exit 0"
 
-[testenv:aarch64]
+[testenv:patcharm64]
 basepython = python2.7
 whitelist_externals =
-  bash
-  git
+  find
 commands =
-  bash -c "patch -f -p1 < docker/Dockerfile.aarch64.patch"
-  git checkout docker/Dockerfile
+  find . -name Dockerfile -exec sed -i -e 's|alpine:3.6|multiarch/alpine:arm64-v3.6|g' \{\} +
+  find . -name Dockerfile -exec sed -i -e 's|opnfv/functest-core|opnfv/functest-core:arm64-latest|g' \{\} +