X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tox.ini;h=9acfffe4c7889cf2429428304b6487f701f212d6;hb=71ba783c1279370af035ff7cac2de7522e95de78;hp=9fc18b39fe022ee9f710f994d0c0ec415b5d6960;hpb=671b3356e8fc7c6219919f978a3dee6b69e8c663;p=functest-xtesting.git diff --git a/tox.ini b/tox.ini index 9fc18b39..9acfffe4 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 \ @@ -60,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