diff options
author | Tim Smith <tsmith@chef.io> | 2021-06-09 12:03:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-09 12:03:21 -0700 |
commit | bb40220e43adf96561619d41f0a1ef1fe1635012 (patch) | |
tree | 2c879a0fc9d47ad59327001eae998dcde5b394d7 | |
parent | c3d5f335a44e68d371f5393f6c7ad08d8de0736c (diff) | |
download | chef-bb40220e43adf96561619d41f0a1ef1fe1635012.tar.gz |
Add testing of installing knife into the client (#11682)
* Test installing knife gem into the client
Let's make sure this works on all platforms
Signed-off-by: Tim Smith <tsmith@chef.io>
* Remove ed25519 gem from the omnibus install
If we can install knife we're good.
Signed-off-by: Tim Smith <tsmith@chef.io>
* Install knife on everything but RHEL 6
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb | 11 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 2 |
4 files changed, 7 insertions, 9 deletions
@@ -22,7 +22,6 @@ group(:omnibus_package) do gem "rb-readline" gem "inspec-core-bin", "~> 4.24" # need to provide the binaries for inspec gem "chef-vault" - gem "ed25519", "~> 1.2" # to make it possible to install knife into chef. Remove this in Chef 18 end group(:omnibus_package, :pry) do diff --git a/Gemfile.lock b/Gemfile.lock index e82b24f983..caf8b0d2b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,7 +157,6 @@ GEM rexml debug_inspector (1.1.0) diff-lcs (1.3) - ed25519 (1.2.4) erubi (1.10.0) erubis (2.7.0) faraday (1.4.2) @@ -415,7 +414,6 @@ DEPENDENCIES chef-vault cheffish (>= 17) chefstyle! - ed25519 (~> 1.2) fauxhai-ng inspec-core-bin (~> 4.24) ohai! diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb b/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb index 93a2c4d467..68c31e633b 100644 --- a/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb +++ b/kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb @@ -15,10 +15,11 @@ pkgs.each do |pkg| multipackage pkgs end -gems = %w{chef-ruby-lvm community_cookbook_releaser} +# 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" -gems.each do |gem| - chef_gem gem do - compile_time false - end +chef_gem gem_name do + action :install + compile_time false end diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index b158cddb7d..360a1fdce5 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: d85ed8bae2eef5d2bd9af93e88330d39773bf0e1 + revision: e86bf087a5c80a16eef90fae62dca9623b37ea2f branch: master specs: omnibus-software (4.0.0) |