diff options
-rw-r--r-- | Gemfile | 5 | ||||
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_chef_gem.rb | 15 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/_packages.rb | 9 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/linux.rb | 1 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/macos.rb | 1 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/end_to_end/recipes/windows.rb | 2 | ||||
-rw-r--r-- | knife/knife.gemspec | 1 |
8 files changed, 26 insertions, 10 deletions
@@ -39,6 +39,11 @@ group(:ruby_shadow) do gem "ruby-shadow", git: "https://github.com/chef/ruby-shadow", branch: "lcg/ruby-3.0", platforms: :ruby end +# deps that cannot be put in the knife gem because they require a compiler and fail on windows nodes +group(:knife_windows_deps) do + gem "ed25519", "~> 1.2" # ed25519 ssh key support +end + group(:development, :test) do gem "rake" gem "rspec" diff --git a/Gemfile.lock b/Gemfile.lock index 9e5adab91f..9bc482678d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,6 +183,7 @@ 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.3) @@ -447,6 +448,7 @@ 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/_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 diff --git a/knife/knife.gemspec b/knife/knife.gemspec index 85c93bbdc4..d121343211 100644 --- a/knife/knife.gemspec +++ b/knife/knife.gemspec @@ -28,7 +28,6 @@ Gem::Specification.new do |s| s.add_dependency "ffi-yajl", "~> 2.2" s.add_dependency "net-ssh", ">= 5.1", "< 7" s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1" - s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support s.add_dependency "bcrypt_pbkdf", "~> 1.1" # ed25519 ssh key support # disabling this until we get get it to compile on RHEL 7 # s.add_dependency "x25519", ">= 1.0.9" # ed25519 KEX module. 1.0.9+ required to resolve sigill failures |