From 6df796c7b66df08b0ca68ef4043e4abeead4558e Mon Sep 17 00:00:00 2001 From: David Wilson Date: Mon, 16 Apr 2018 14:53:45 +0100 Subject: [PATCH] tests: fix Ansible jobs to run on Debian/CentOS images too. --- .travis.yml | 4 ++-- .travis/ansible_tests.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b65c7db..09b1ef51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ env: - MODE=mitogen MITOGEN_TEST_DISTRO=debian - MODE=mitogen MITOGEN_TEST_DISTRO=centos - MODE=debops -- MODE=ansible ANSIBLE_VERSION=2.4.3.0 -- MODE=ansible ANSIBLE_VERSION=2.5.0 +- MODE=ansible ANSIBLE_VERSION=2.4.3.0 MITOGEN_TEST_DISTRO=debian +- MODE=ansible ANSIBLE_VERSION=2.5.0 MITOGEN_TEST_DISTRO=centos install: - pip install -r dev_requirements.txt diff --git a/.travis/ansible_tests.sh b/.travis/ansible_tests.sh index 4fc69891..9b6638f0 100755 --- a/.travis/ansible_tests.sh +++ b/.travis/ansible_tests.sh @@ -4,6 +4,7 @@ TRAVIS_BUILD_DIR="${TRAVIS_BUILD_DIR:-`pwd`}" TMPDIR="/tmp/ansible-tests-$$" ANSIBLE_VERSION="${ANSIBLE_VERSION:-2.4.3.0}" +MITOGEN_TEST_DISTRO="${MITOGEN_TEST_DISTRO:-debian}" function on_exit() { @@ -16,7 +17,7 @@ mkdir "$TMPDIR" echo travis_fold:start:docker_setup -docker run --rm --detach --name=target d2mw/mitogen-test /bin/sleep 86400 +docker run --rm --detach --name=target d2mw/mitogen-${MITOGEN_TEST_DISTRO}-test /bin/sleep 86400 echo travis_fold:end:docker_setup