diff options
-rw-r--r-- | chef-utils/lib/chef-utils/dist.rb | 2 | ||||
-rw-r--r-- | knife/Gemfile | 2 | ||||
-rw-r--r-- | omnibus/config/software/more-ruby-cleanup.rb | 4 | ||||
-rwxr-xr-x | tasks/bin/run_external_test | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/chef-utils/lib/chef-utils/dist.rb b/chef-utils/lib/chef-utils/dist.rb index d8dfde5cd1..d70a2bb3a5 100644 --- a/chef-utils/lib/chef-utils/dist.rb +++ b/chef-utils/lib/chef-utils/dist.rb @@ -112,7 +112,7 @@ module ChefUtils SERVER_CTL = "chef-server-ctl" # OS user for server - SYSTEM_USER = "opscode" + SYSTEM_USER = "opscode" end class Solo diff --git a/knife/Gemfile b/knife/Gemfile index a2321726c7..20c1d9657f 100644 --- a/knife/Gemfile +++ b/knife/Gemfile @@ -20,7 +20,7 @@ group(:chefstyle) do gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main" end -gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main" +gem "ohai", git: "https://github.com/chef/ohai.git", branch: "17-stable" gem "chef", path: ".." gem "chef-utils", path: File.expand_path("../chef-utils", __dir__) if File.exist?(File.expand_path("../chef-utils", __dir__)) gem "chef-config", path: File.expand_path("../chef-config", __dir__) if File.exist?(File.expand_path("../chef-config", __dir__)) diff --git a/omnibus/config/software/more-ruby-cleanup.rb b/omnibus/config/software/more-ruby-cleanup.rb index ab399b8671..ba3c0d3fd4 100644 --- a/omnibus/config/software/more-ruby-cleanup.rb +++ b/omnibus/config/software/more-ruby-cleanup.rb @@ -82,8 +82,8 @@ build do block "Removing VERSION files from installed gems" do # find the embedded ruby gems dir and clean it up for globbing Dir.glob("#{install_dir}/embedded/lib/ruby/gems/*/gems/*/VERSION".tr("\\", "/")).each do |f| - # we need to not delete the aws SDK VERSION file - next if File.basename(File.expand_path("..", f)).start_with?("aws") + # we need to not delete the aws SDK VERSION file or jmespath's VERSION file + next if File.basename(File.expand_path("..", f)).start_with?("aws", "jmespath") puts "Deleting #{f}" FileUtils.rm_rf(f) diff --git a/tasks/bin/run_external_test b/tasks/bin/run_external_test index 45568f51ac..65275c5aba 100755 --- a/tasks/bin/run_external_test +++ b/tasks/bin/run_external_test @@ -21,7 +21,7 @@ build_dir = Dir.pwd env = { "GEMFILE_MOD" => "gem 'chef', path: '#{build_dir}'; " \ - "gem 'ohai', git: 'https://github.com/chef/ohai.git', branch: 'main'", + "gem 'ohai', git: 'https://github.com/chef/ohai.git', branch: '17-stable'", "CHEF_LICENSE" => "accept-no-persist", } |