Skip to content
This repository has been archived by the owner on Jan 19, 2019. It is now read-only.

Commit

Permalink
Require 12.5 or later and remove compat_resource
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <[email protected]>
  • Loading branch information
tas50 committed Feb 14, 2017
1 parent 2d936bf commit fd855fe
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 27 deletions.
18 changes: 2 additions & 16 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 All @@ -28,12 +27,6 @@ platforms:
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: centos-5
driver:
image: centos:5
platform: rhel
pid_one_command: /sbin/init

- name: centos-6
driver:
image: centos:6
Expand All @@ -53,13 +46,6 @@ platforms:
intermediate_instructions:
- RUN dnf -y install yum

- 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
Expand All @@ -79,9 +65,9 @@ platforms:
image: opensuse:13.2
pid_one_command: /bin/systemd

- name: opensuse-42.1
- name: opensuse-leap
driver:
image: opensuse:42.1
image: opensuse:leap
pid_one_command: /bin/systemd

suites:
Expand Down
7 changes: 2 additions & 5 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ verifier:
name: inspec

platforms:
- name: centos-5.11
- name: centos-6.8
- name: centos-7.2
- name: centos-7.3
- name: debian-7.11
- name: debian-8.6
- name: fedora-25
run_list: yum::dnf_yum_compat
- name: freebsd-10.3
run_list:
- freebsd::portsnap
Expand All @@ -26,8 +24,7 @@ platforms:
driver:
box: omnios/r151014
- name: opensuse-13.2
- name: opensuse-leap-42.1
- name: ubuntu-12.04
- name: opensuse-leap-42.2
- name: ubuntu-14.04
- name: ubuntu-16.04
- name: solaris-11
Expand Down
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ env:
- INSTANCE=default-debian-7
- INSTANCE=default-debian-8
- INSTANCE=default-opensuse-132
- INSTANCE=default-opensuse-421
- INSTANCE=default-ubuntu-1204
- INSTANCE=default-opensuse-leap
- 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,7 +3,6 @@ source 'https://supermarket.chef.io'
metadata

group :integration do
cookbook 'yum'
cookbook 'freebsd'
cookbook 'test', path: 'test/cookbooks/test'
end
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Installs packages required for compiling C software from source. Use this cookbo

### Chef

- Chef 12.1+
- Chef 12.5+

### Cookbooks

Expand Down
3 changes: 1 addition & 2 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@

depends 'seven_zip'
depends 'mingw', '>= 1.1'
depends 'compat_resource', '>= 12.16.3'

source_url 'https://github.com/chef-cookbooks/build-essential'
issues_url 'https://github.com/chef-cookbooks/build-essential/issues'
chef_version '>= 12.1'
chef_version '>= 12.5'

0 comments on commit fd855fe

Please sign in to comment.