cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Turn mount test back on (#17797)

Browse source 
* Turn mount test back on

* Mount tests need PRIVILEGED so turn that back on

Revert "Revert "Set PRIVILEGED=true for non_destructive tests. (#17733)" (#17738)"

This reverts commit dc0fb1c212.

* Add a needs_privileged tag so that we can skip mount tests on centos6

Some containers timeout on shippable tests when run with privileged.
Unfortunately, some tests require that in order to run.  Tagging those
allows us to skip those tests on the platforms that timeout when we get
ready to run the integration test in shippable.

* Centos6 times out with PRIVILEGED set so remove that (will disable the mount tests on centos6)

* Remove false start
This commit is contained in:
Toshio Kuratomi 2016-09-28 10:52:33 -07:00 committed by GitHub
parent 17c0f52c96
commit 4452ee86bd
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
shippable.yml
View file

@ -27,14 +27,14 @@ matrix:
- 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
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora-rawhide
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora23
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:opensuseleap
- 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=non_destructive IMAGE=ansible/ansible:centos7 PRIVILEGED=true
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora-rawhide PRIVILEGED=true
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:fedora23 PRIVILEGED=true
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:opensuseleap PRIVILEGED=true
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1604 PRIVILEGED=true
- env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1604py3 PYTHON3=1 PRIVILEGED=true
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos6
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:centos7

2
test/integration/non_destructive.yml
View file

@ -44,4 +44,4 @@
- { role: test_add_host, tags: test_add_host }
- { role: test_binary, tags: test_binary }
- { role: test_loops, tags: test_loops }
#- { role: test_mount, tags: [test_mount, requires_root] }
- { role: test_mount, tags: [test_mount, needs_root, needs_privileged]}

4
test/utils/shippable/integration.sh
View file

@ -109,6 +109,10 @@ if [ "${test_python3}" ]; then
test_flags="--skip-tags ${skip_tags} ${test_flags}"
fi
if [ "${test_privileged}" = 'false' ]; then
test_flags="--skip-tags needs_privileged ${test_flags}"
fi
if [ -z "${share_source}" ]; then
docker exec "${container_id}" cp -a "${test_shared_dir}" "${test_ansible_dir}"
fi