From 77a3ae2fb07480fad67f19062eb05ea960ec368d Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 26 Jan 2017 11:28:24 -0800 Subject: [PATCH] Update platforms to test with test kitchen Signed-off-by: Tim Smith --- .kitchen.docker.yml | 7 ------- .kitchen.yml | 7 ++----- .travis.yml | 1 - Berksfile | 1 - 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml index 7f535d4..df09ebd 100644 --- a/.kitchen.docker.yml +++ b/.kitchen.docker.yml @@ -53,13 +53,6 @@ platforms: intermediate_instructions: - RUN dnf -y install yum which systemd-sysv initscripts -- name: ubuntu-12.04 - driver: - image: ubuntu-upstart:12.04 - pid_one_command: /sbin/init - intermediate_instructions: - - RUN /usr/bin/apt-get update - - name: ubuntu-14.04 driver: image: ubuntu-upstart:14.04 diff --git a/.kitchen.yml b/.kitchen.yml index d1ea7c6..7174ce4 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -6,17 +6,14 @@ provisioner: platforms: - name: centos-6.8 - - name: centos-7.2 + - name: centos-7.3 - name: debian-7.11 run_list: apt::default - name: debian-8.6 run_list: apt::default - name: fedora-25 - run_list: yum::dnf_yum_compat - name: opensuse-13.2 - - name: opensuse-leap-42.1 - - name: ubuntu-12.04 - run_list: apt::default + - name: opensuse-leap-42.2 - name: ubuntu-14.04 run_list: apt::default - name: ubuntu-16.04 diff --git a/.travis.yml b/.travis.yml index 72e9a81..5ea79b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ env: matrix: - INSTANCE=default-centos-6 - INSTANCE=default-centos-7 - - INSTANCE=default-ubuntu-1204 - INSTANCE=default-ubuntu-1404 - INSTANCE=default-ubuntu-1604 diff --git a/Berksfile b/Berksfile index 165f6b0..510a127 100644 --- a/Berksfile +++ b/Berksfile @@ -3,7 +3,6 @@ source 'https://supermarket.chef.io' metadata group :integration do - cookbook 'yum' cookbook 'apt' cookbook 'test', path: 'test/fixtures/cookbooks/test' end