summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortyler-ball <tball@chef.io>2020-02-02 11:18:28 -0800
committertyler-ball <tball@chef.io>2020-02-02 13:43:12 -0800
commit89f38e5833083371364308333de7126a1c964c2d (patch)
tree487d3972bf70dbd348a0d1d0564c626d973f2ace
parent3b8e50d213178a16e8569269133d700764379859 (diff)
downloadchef-fix_chef-15.tar.gz
Pinning ohai branch to get tests buildingfix_chef-15
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 <tball@chef.io>
-rwxr-xr-xtasks/bin/run_external_test2
1 files changed, 1 insertions, 1 deletions
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",
}