Commit 254e64b4 authored by Tim Smith's avatar Tim Smith
Browse files

Require Chef Client 14+ and remove the dependency on build-essential



The build_essential resource is built into chef 14+
Signed-off-by: default avatarTim Smith <tsmith@chef.io>
parent d26177f4
...@@ -19,23 +19,10 @@ services: docker ...@@ -19,23 +19,10 @@ services: docker
env: env:
matrix: matrix:
- CHEF_VERSION=13 INSTANCE=default-ubuntu-1604
- CHEF_VERSION=13 INSTANCE=default-ubuntu-1804
- CHEF_VERSION=13 INSTANCE=default-debian-8
- CHEF_VERSION=13 INSTANCE=default-debian-9
- CHEF_VERSION=13 INSTANCE=default-centos-6
- CHEF_VERSION=13 INSTANCE=default-centos-7
- CHEF_VERSION=13 INSTANCE=default-fedora-latest
- CHEF_VERSION=13 INSTANCE=source-ubuntu-1604
- CHEF_VERSION=13 INSTANCE=source-ubuntu-1804
- CHEF_VERSION=13 INSTANCE=source-debian-8
- CHEF_VERSION=13 INSTANCE=source-debian-9
- CHEF_VERSION=13 INSTANCE=source-fedora-latest
- CHEF_VERSION=13 INSTANCE=source-centos-7
- CHEF_VERSION=14 INSTANCE=default-ubuntu-1604 - CHEF_VERSION=14 INSTANCE=default-ubuntu-1604
- CHEF_VERSION=14 INSTANCE=default-ubuntu-1804 - CHEF_VERSION=14 INSTANCE=default-ubuntu-1804
- CHEF_VERSION=14 INSTANCE=default-debian-8
- CHEF_VERSION=14 INSTANCE=default-debian-9 - CHEF_VERSION=14 INSTANCE=default-debian-9
- CHEF_VERSION=14 INSTANCE=default-debian-10
- CHEF_VERSION=14 INSTANCE=default-centos-6 - CHEF_VERSION=14 INSTANCE=default-centos-6
- CHEF_VERSION=14 INSTANCE=default-centos-7 - CHEF_VERSION=14 INSTANCE=default-centos-7
- CHEF_VERSION=14 INSTANCE=default-fedora-latest - CHEF_VERSION=14 INSTANCE=default-fedora-latest
...@@ -45,6 +32,19 @@ env: ...@@ -45,6 +32,19 @@ env:
- CHEF_VERSION=14 INSTANCE=source-debian-9 - CHEF_VERSION=14 INSTANCE=source-debian-9
- CHEF_VERSION=14 INSTANCE=source-fedora-latest - CHEF_VERSION=14 INSTANCE=source-fedora-latest
- CHEF_VERSION=14 INSTANCE=source-centos-7 - CHEF_VERSION=14 INSTANCE=source-centos-7
- CHEF_VERSION INSTANCE=default-ubuntu-1604
- CHEF_VERSION INSTANCE=default-ubuntu-1804
- CHEF_VERSION INSTANCE=default-debian-8
- CHEF_VERSION INSTANCE=default-debian-9
- CHEF_VERSION INSTANCE=default-centos-6
- CHEF_VERSION INSTANCE=default-centos-7
- CHEF_VERSION INSTANCE=default-fedora-latest
- CHEF_VERSION INSTANCE=source-ubuntu-1604
- CHEF_VERSION INSTANCE=source-ubuntu-1804
- CHEF_VERSION INSTANCE=source-debian-9
- CHEF_VERSION INSTANCE=source-debian-10
- CHEF_VERSION INSTANCE=source-fedora-latest
- CHEF_VERSION INSTANCE=source-centos-7
before_script: before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
......
...@@ -15,13 +15,12 @@ Manages installation of Erlang via packages or source. ...@@ -15,13 +15,12 @@ Manages installation of Erlang via packages or source.
### Chef ### Chef
- Chef 13.3+ - Chef 14+
### Cookbooks ### Cookbooks
- yum-epel - yum-epel
- yum-erlang_solutions - yum-erlang_solutions
- build-essential (for source compilation)
## Attributes ## Attributes
......
...@@ -25,16 +25,16 @@ platforms: ...@@ -25,16 +25,16 @@ platforms:
image: dokken/amazonlinux-2 image: dokken/amazonlinux-2
pid_one_command: /usr/lib/systemd/systemd pid_one_command: /usr/lib/systemd/systemd
- name: debian-8 - name: debian-9
driver: driver:
image: dokken/debian-8 image: dokken/debian-9
pid_one_command: /bin/systemd pid_one_command: /bin/systemd
intermediate_instructions: intermediate_instructions:
- RUN /usr/bin/apt-get update - RUN /usr/bin/apt-get update
- name: debian-9 - name: debian-10
driver: driver:
image: dokken/debian-9 image: dokken/debian-10
pid_one_command: /bin/systemd pid_one_command: /bin/systemd
intermediate_instructions: intermediate_instructions:
- RUN /usr/bin/apt-get update - RUN /usr/bin/apt-get update
......
...@@ -4,10 +4,8 @@ maintainer_email 'cookbooks@chef.io' ...@@ -4,10 +4,8 @@ maintainer_email 'cookbooks@chef.io'
license 'Apache-2.0' license 'Apache-2.0'
description 'Installs erlang, optionally install GUI tools.' description 'Installs erlang, optionally install GUI tools.'
version '7.0.1' version '7.0.1'
depends 'yum-epel' depends 'yum-epel'
depends 'yum-erlang_solutions', '>= 1.0.3' depends 'yum-erlang_solutions', '>= 1.0.3'
depends 'build-essential', '>= 5.0'
%w( amazon centos debian oracle redhat scientific ubuntu zlinux ).each do |os| %w( amazon centos debian oracle redhat scientific ubuntu zlinux ).each do |os|
supports os supports os
...@@ -15,4 +13,4 @@ end ...@@ -15,4 +13,4 @@ end
source_url 'https://github.com/chef-cookbooks/erlang' source_url 'https://github.com/chef-cookbooks/erlang'
issues_url 'https://github.com/chef-cookbooks/erlang/issues' issues_url 'https://github.com/chef-cookbooks/erlang/issues'
chef_version '>= 13.3' chef_version '>= 14'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment