From e04d552bc61c49e98046f8a39c4193672da6cc8a Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 28 Jun 2016 12:51:15 -0700 Subject: [PATCH] Run shippable tests in unprivileged containers. (#16481) * Run shippable tests in unprivileged containers. --- shippable.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/shippable.yml b/shippable.yml index d04b3641466..4d9c83009af 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