From b3fd17bdf869790caa38f5d5801ae3c2b00f6b80 Mon Sep 17 00:00:00 2001 From: Adrien Waksberg Date: Wed, 15 Aug 2018 07:46:37 +0200 Subject: [PATCH] chore: use new docker image for the tests --- .kitchen.yml | 5 ++--- .travis.yml | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index ac02880..dc2052e 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -8,16 +8,15 @@ provisioner: name: ansible_playbook hosts: localhost require_ansible_repo: false - require_ansible_omnibus: true + require_ansible_omnibus: false require_chef_for_busser: true ansible_verbose: false - ansible_version: <% if ENV['ANSIBLE_VERSION'] %><%= ENV['ANSIBLE_VERSION'] %><% else %><%= '2.4.6.0' %><% end %> ansible_inventory: ./test/integration/inventory platforms: - name: debian-9 driver_config: - image: nishiki/ansible:stretch + image: nishiki/debian9:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.6' %> command: /bin/systemd volume: - /sys/fs/cgroup:/sys/fs/cgroup:ro diff --git a/.travis.yml b/.travis.yml index 7b2f4c5..ef6e6f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ sudo: required language: ruby env: - - ANSIBLE_VERSION=2.4.6.0 - - ANSIBLE_VERSION=2.5.7.0 - - ANSIBLE_VERSION=2.6.2.0 + - ANSIBLE_VERSION=2.4 + - ANSIBLE_VERSION=2.5 + - ANSIBLE_VERSION=2.6 services: - docker