From 89f38e5833083371364308333de7126a1c964c2d Mon Sep 17 00:00:00 2001 From: tyler-ball Date: Sun, 2 Feb 2020 11:18:28 -0800 Subject: Pinning ohai branch to get tests building Our external gem tests need to be pinned to the same branch of Ohai that the Chef Client source code is. Otherwise we get a Bundler error. Signed-off-by: tyler-ball --- tasks/bin/run_external_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/bin/run_external_test b/tasks/bin/run_external_test index 90cf9e2e0c..36fde0ea4d 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'", + "gem 'ohai', git: 'https://github.com/chef/ohai.git', branch: '15-stable'", "CHEF_LICENSE" => "accept-no-persist", } -- cgit v1.2.1