From f15ce3ea7c1b7f8fd5fc538d4223e21ad782340e Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 14 Feb 2017 16:21:09 -0800 Subject: [PATCH] Update testing Signed-off-by: Tim Smith --- .kitchen.docker.yml | 9 --------- .kitchen.yml | 5 +---- .travis.yml | 1 - Berksfile | 1 - metadata.rb | 1 - 5 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml index 22fda1a..56a0645 100644 --- a/.kitchen.docker.yml +++ b/.kitchen.docker.yml @@ -1,7 +1,6 @@ driver: name: dokken privileged: true # because Docker and SystemD/Upstart - chef_image: chef/chef chef_version: current transport: @@ -30,14 +29,6 @@ platforms: - RUN /usr/bin/apt-get update - RUN /usr/bin/apt-get install lsb-release -y -- name: centos-5 - driver: - image: centos:5 - platform: rhel - pid_one_command: /sbin/init - intermediate_instructions: - - RUN yum install -y which initscripts - - name: centos-6 driver: image: centos:6 diff --git a/.kitchen.yml b/.kitchen.yml index ba58b23..a6650bb 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -5,15 +5,12 @@ provisioner: name: chef_zero platforms: - - name: centos-5.11 - name: centos-6.8 - # - name: centos-7.2 # heartbeat is no longer included in centos 7 + # - name: centos-7.3 # heartbeat is no longer included in centos 7 - name: debian-7.11 run_list: apt::default - name: debian-8.6 run_list: apt::default - - name: ubuntu-12.04 - run_list: apt::default - name: ubuntu-14.04 run_list: apt::default - name: ubuntu-16.04 diff --git a/.travis.yml b/.travis.yml index 2721711..79839d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ env: - INSTANCE=default-centos-6 - INSTANCE=default-debian-7 - INSTANCE=default-debian-8 - - INSTANCE=default-ubuntu-1204 - INSTANCE=default-ubuntu-1404 - INSTANCE=default-ubuntu-1604 diff --git a/Berksfile b/Berksfile index 5cca095..15a237d 100644 --- a/Berksfile +++ b/Berksfile @@ -3,6 +3,5 @@ source 'https://supermarket.chef.io' metadata group :integration do - cookbook 'yum' cookbook 'apt' end diff --git a/metadata.rb b/metadata.rb index 2aa38b5..860367f 100644 --- a/metadata.rb +++ b/metadata.rb @@ -16,5 +16,4 @@ source_url 'https://github.com/chef-cookbooks/heartbeat' issues_url 'https://github.com/chef-cookbooks/heartbeat/issues' - chef_version '>= 12.1'