From 23866e4b31e2acf4f075770b6c41993b5f6d7a69 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 13 Sep 2016 22:35:21 -0500 Subject: [PATCH] Fix stalling tests on init systems. --- .travis.yml | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c496ea..ce781f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,24 +2,33 @@ sudo: required env: - - distro: centos7 - init: /usr/lib/systemd/systemd - run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" - - distro: ubuntu1604 - init: /lib/systemd/systemd - run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" - - distro: ubuntu1404 - init: /sbin/init - run_opts: "" - - distro: ubuntu1204 - init: /sbin/init - run_opts: "" + global: + # https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306 + DOCKER_VERSION: "1.9.1-0~trusty" + matrix: + - distro: centos7 + init: /usr/lib/systemd/systemd + run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" + - distro: ubuntu1604 + init: /lib/systemd/systemd + run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" + - distro: ubuntu1404 + init: /sbin/init + run_opts: "" + - distro: ubuntu1204 + init: /sbin/init + run_opts: "" services: - docker before_install: - # Pull container + # Downgrade to older version of Docker engine. + - sudo apt-get update + - sudo apt-get remove docker-engine -yq + - sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew" + + # Pull container. - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest' script: