summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2016-09-08 18:55:15 -0700
committerGitHub <noreply@github.com>2016-09-08 18:55:15 -0700
commitc81fe70fbfcd083537558b5bd6bda9d284e2959d (patch)
treed9a5f8f836a4b05dc9dbb2e8b1ed387eff38b72c
parentd31756091402f01adacf51e6a992929986f3307b (diff)
downloadansible-c81fe70fbfcd083537558b5bd6bda9d284e2959d.tar.gz
Enable more integration tests for python 3. (#17473)
* Enable more integration tests for python 3. * Split out python 3 integration tests. Now that we're running more integration tests on python 3, the tests are taking long enough that they warrant splitting out in the same way the python 2 tests are split.
-rw-r--r--shippable.yml5
-rw-r--r--test/utils/shippable/python3-test-tag-blacklist.txt2
2 files changed, 3 insertions, 4 deletions
diff --git a/shippable.yml b/shippable.yml
index 19feee55ca..f10b7b2299 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -24,6 +24,7 @@ matrix:
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
- env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1604
+ - env: TEST=integration TARGET=destructive IMAGE=ansible/ansible:ubuntu1604py3 PYTHON3=1
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos6
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:centos7
@@ -33,6 +34,7 @@ matrix:
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1204
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1404
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1604
+ - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1604py3 PYTHON3=1
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos6
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos7
@@ -42,8 +44,7 @@ matrix:
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1204
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1404
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1604
-
- - env: TEST=integration TARGET=all IMAGE=ansible/ansible:ubuntu1604py3 PYTHON3=1
+ - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1604py3 PYTHON3=1
- env: TEST=sanity INSTALL_DEPS=1 TOXENV=py24
python: 2.7
diff --git a/test/utils/shippable/python3-test-tag-blacklist.txt b/test/utils/shippable/python3-test-tag-blacklist.txt
index f252340cd7..b6a539bcda 100644
--- a/test/utils/shippable/python3-test-tag-blacklist.txt
+++ b/test/utils/shippable/python3-test-tag-blacklist.txt
@@ -1,6 +1,4 @@
test_apache2_module
-test_apt
-test_apt_repository
test_assemble
test_authorized_key
test_filters