From 4638bf01b05b4dfc98b6b106e6d95f4f7a37a6e1 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Mon, 18 Sep 2017 10:36:04 -0700 Subject: Add the multipackage stuff back Signed-off-by: Tim Smith --- kitchen-tests/Berksfile.lock | 3 +++ kitchen-tests/cookbooks/base/metadata.rb | 1 + kitchen-tests/cookbooks/base/recipes/packages.rb | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'kitchen-tests') diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index c38893c2dc..7bf9e1164a 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -13,6 +13,7 @@ GRAPH chef-client (>= 0.0.0) chef_hostname (>= 0.0.0) logrotate (>= 0.0.0) + multipackage (>= 0.0.0) nscd (>= 0.0.0) ntp (>= 0.0.0) openssh (>= 0.0.0) @@ -38,6 +39,8 @@ GRAPH logrotate (2.2.0) mingw (2.0.1) seven_zip (>= 0.0.0) + multipackage (4.0.0) + compat_resource (>= 0.0.0) mysql (8.5.1) nscd (5.0.0) ntp (3.5.2) diff --git a/kitchen-tests/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/base/metadata.rb index f95dca7c04..9a85a0e24b 100644 --- a/kitchen-tests/cookbooks/base/metadata.rb +++ b/kitchen-tests/cookbooks/base/metadata.rb @@ -13,6 +13,7 @@ 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 9a74b0bf9d..bb5fa7bb71 100644 --- a/kitchen-tests/cookbooks/base/recipes/packages.rb +++ b/kitchen-tests/cookbooks/base/recipes/packages.rb @@ -7,7 +7,13 @@ # 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. -package %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget telnet subversion git traceroute htop tmux } +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 the +# multipackage cookbook. +pkgs.each do |pkg| + multipackage pkgs +end gems = %w{fpm aws-sdk} -- cgit v1.2.1