Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update INFO file with new PTL information
[functest.git]
/
tox.ini
diff --git
a/tox.ini
b/tox.ini
index
9fc18b3
..
62eaf00
100644
(file)
--- a/
tox.ini
+++ b/
tox.ini
@@
-1,15
+1,14
@@
[tox]
[tox]
-envlist = docs,pep8,pylint,py35,py27,perm
,aarch64
+envlist = docs,pep8,pylint,py35,py27,perm
[testenv]
usedevelop = True
deps =
[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
-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 \
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"
bash -c "\
find {[testenv:perm]path} -exec file \{\} + | grep CRLF && exit 1 || exit 0"
-[testenv:
aarch
64]
+[testenv:
patcharm
64]
basepython = python2.7
whitelist_externals =
basepython = python2.7
whitelist_externals =
- bash
- git
+ find
commands =
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' \{\} +