summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-09-15 22:09:37 -0700
committerTim Smith <tsmith@chef.io>2017-09-18 10:10:55 -0700
commit9b0e03786d0fdf954d36eafb4dde9db49acd3840 (patch)
treeee78b7438754c9f3c8a938e39b8dab672d17c6dd /kitchen-tests
parente9941330478e0914901181b330e2b2ae6c25a5d1 (diff)
downloadchef-9b0e03786d0fdf954d36eafb4dde9db49acd3840.tar.gz
Use Chef's built in multipackage
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/cookbooks/base/metadata.rb1
-rw-r--r--kitchen-tests/cookbooks/base/recipes/packages.rb7
2 files changed, 1 insertions, 7 deletions
diff --git a/kitchen-tests/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/base/metadata.rb
index 9a85a0e24b..f95dca7c04 100644
--- a/kitchen-tests/cookbooks/base/metadata.rb
+++ b/kitchen-tests/cookbooks/base/metadata.rb
@@ -13,7 +13,6 @@ depends "build-essential"
depends "chef-client"
depends "chef_hostname"
depends "logrotate"
-depends "multipackage"
depends "nscd"
depends "ntp"
depends "openssh"
diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/base/recipes/packages.rb
index ace888ec18..9a74b0bf9d 100644
--- a/kitchen-tests/cookbooks/base/recipes/packages.rb
+++ b/kitchen-tests/cookbooks/base/recipes/packages.rb
@@ -7,12 +7,7 @@
# this is just a list of package that exist on every O/S we test, and often aren't installed by default. you don't
# have to get too clever here, you can delete packages if they don't exist everywhere we test.
-pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux }
-
-# this deliberately calls the multipackage API N times in order to do one package installation in order to exercise multipackage api
-pkgs.each do |pkg|
- multipackage pkgs
-end
+package %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux }
gems = %w{fpm aws-sdk}