summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2016-06-28 12:51:15 -0700
committerGitHub <noreply@github.com>2016-06-28 12:51:15 -0700
commite04d552bc61c49e98046f8a39c4193672da6cc8a (patch)
tree3c9f7f0544a82eb43230878683b0705b097b5a18
parentd843e5a79d4489635c428bde995488dcc123225e (diff)
downloadansible-e04d552bc61c49e98046f8a39c4193672da6cc8a.tar.gz
Run shippable tests in unprivileged containers. (#16481)
* Run shippable tests in unprivileged containers.
-rw-r--r--shippable.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/shippable.yml b/shippable.yml
index d04b364146..4d9c83009a 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -22,8 +22,8 @@ matrix:
- 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 PRIVILEGED=true
- - env: TEST=integration TARGET=non_destructive IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
+ - 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=other IMAGE=ansible/ansible:centos6
@@ -31,8 +31,8 @@ matrix:
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora-rawhide
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:fedora23
- env: TEST=integration TARGET=other IMAGE=ansible/ansible:opensuseleap
- - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1204 PRIVILEGED=true
- - env: TEST=integration TARGET=other IMAGE=ansible/ansible:ubuntu1404 PRIVILEGED=true
+ - 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=sanity INSTALL_DEPS=1 TOXENV=py24
@@ -49,6 +49,8 @@ matrix:
- env: TEST=code-smell INSTALL_DEPS=1
python: 2.7
build:
+ pre_ci_boot:
+ options: "--privileged=false --net=bridge"
ci:
- test/utils/shippable/ci.sh