Skip to content

Commit

Permalink
Update testing
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <tsmith@chef.io>
  • Loading branch information
tas50 committed Feb 15, 2017
1 parent a237b80 commit f15ce3e
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 16 deletions.
9 changes: 0 additions & 9 deletions .kitchen.docker.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
driver:
name: dokken
privileged: true # because Docker and SystemD/Upstart
chef_image: chef/chef
chef_version: current

transport:
Expand Down Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ source 'https://supermarket.chef.io'
metadata

group :integration do
cookbook 'yum'
cookbook 'apt'
end
1 change: 0 additions & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'

0 comments on commit f15ce3e

Please sign in to comment.