summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-02 17:13:00 -0800
committerGitHub <noreply@github.com>2018-03-02 17:13:00 -0800
commit7ae53f5e17688e3bfff2b33a2f1cf767b5f95976 (patch)
tree95616c2677def197fb2e928c4544b5f3b7ec629c
parent5e096ce63a31f8cc5610e1376dc976088ede7c5c (diff)
parent77dce258d1b6bf625e34172d249624c30d15af2b (diff)
downloadchef-7ae53f5e17688e3bfff2b33a2f1cf767b5f95976.tar.gz
Merge pull request #6939 from chef/kitchen-tests
Update our tests based on new resources we ship
-rw-r--r--kitchen-tests/cookbooks/base/metadata.rb4
-rw-r--r--kitchen-tests/cookbooks/base/recipes/default.rb2
2 files changed, 2 insertions, 4 deletions
diff --git a/kitchen-tests/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/base/metadata.rb
index 83d460a17b..87efeb710d 100644
--- a/kitchen-tests/cookbooks/base/metadata.rb
+++ b/kitchen-tests/cookbooks/base/metadata.rb
@@ -8,8 +8,6 @@ version "0.1.0"
gem "chef-sugar"
-depends "apt"
-depends "build-essential"
depends "chef-client"
depends "logrotate"
depends "multipackage"
@@ -31,6 +29,6 @@ supports "opensuse"
supports "fedora"
supports "amazon"
-chef_version ">= 13"
+chef_version ">= 14"
issues_url "https://github.com/chef/chef/issues"
source_url "https://github.com/chef/chef"
diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/base/recipes/default.rb
index 62823c1d37..350b5637e9 100644
--- a/kitchen-tests/cookbooks/base/recipes/default.rb
+++ b/kitchen-tests/cookbooks/base/recipes/default.rb
@@ -25,7 +25,7 @@ yum_repository "epel" do
only_if { platform_family?("rhel") }
end
-include_recipe "build-essential"
+build_essential "install compilation tools"
include_recipe "::packages"