diff options
| author | Tim Smith <tsmith84@gmail.com> | 2021-10-05 12:10:27 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2021-10-05 12:10:27 -0700 |
| commit | 3a81c2b750076d793407c8ace8af48bed1c2c378 (patch) | |
| tree | 5f5f8cfbc46f60c4a9a5ef8903d556439708fa47 | |
| parent | cb5fa332bf29a7f1e56e20ebdaeb2b7c51181e9f (diff) | |
| download | chef-knife_install.tar.gz | |
Test knife install on all platforms in TKknife_install
Make sure this works throughout.
Signed-off-by: Tim Smith <tsmith@chef.io>
5 files changed, 19 insertions, 9 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_chef_gem.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_gem.rb new file mode 100644 index 0000000000..00833ec141 --- /dev/null +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_chef_gem.rb @@ -0,0 +1,15 @@ +# +# Cookbook:: end_to_end +# Recipe:: chef_gem +# +# Copyright:: Copyright (c) Chef Software Inc. +# + +# make sure customers can install knife back into the client for now +# and also make sure chef_gem works in general +gem_name = rhel6? ? "community_cookbook_releaser" : "knife" + +chef_gem gem_name do + action :install + compile_time false +end
\ No newline at end of file diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb index 68c31e633b..965ab1018e 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb @@ -14,12 +14,3 @@ pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget subversion trace pkgs.each do |pkg| multipackage pkgs end - -# make sure customers can install knife back into the client for now -# and also make sure chef_gem works in general -gem_name = rhel6? ? "community_cookbook_releaser" : "knife" - -chef_gem gem_name do - action :install - compile_time false -end diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb index eddedcab6f..c08bc4ee2e 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb @@ -36,6 +36,7 @@ build_essential do end include_recipe "::_packages" +include_recipe "::_chef_gem" include_recipe "ntp" unless fedora? # fedora 34+ doesn't have NTP diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb index 361a054576..b83eb74506 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/macos.rb @@ -108,3 +108,4 @@ include_recipe "::_dmg_package" include_recipe "::_macos_userdefaults" include_recipe "::_ohai_hint" include_recipe "::_openssl" +include_recipe "::_chef_gem" diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb b/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb index 116e78ce6c..e6ec98ffde 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb @@ -190,3 +190,5 @@ windows_update_settings "Disable Windows Update" do block_windows_update_website true disable_automatic_updates true end + +include_recipe "::_chef_gem"
\ No newline at end of file |