diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-11-28 14:27:10 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-11-28 14:28:55 -0800 |
| commit | 26b3e56205f1f26f5d7ec350803654cc8aa887b2 (patch) | |
| tree | d2109f7affa8734e485daa6807e6202f0350a8c9 | |
| parent | 967d3ad3d8fa202cbd4d1ad709a83c8fc67a0bfb (diff) | |
| download | chef-26b3e56205f1f26f5d7ec350803654cc8aa887b2.tar.gz | |
better kithen ohai pinning
since it turns out kitchen-tests/Gemfile.lock isn't actually checked in
the prior change was still just effectively floating on master, this
now makes us parse the ohai version out of the root Gemfile.lock and
use that to install ohai from git in our virt.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | kitchen-tests/kitchen.travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml index 55427c466d..160f92eb51 100644 --- a/kitchen-tests/kitchen.travis.yml +++ b/kitchen-tests/kitchen.travis.yml @@ -17,7 +17,7 @@ provisioner: github_owner: "chef" github_repo: "chef" refname: <%= ENV['TRAVIS_COMMIT'] %> - ohai_refname: "<%= "v" + `bundle exec ohai --version`.split(/\s+/)[1] %>" + ohai_refname: "<%= File.readlines('../Gemfile.lock', File.expand_path(File.dirname(__FILE__))).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; 'v' + $1 %>" github_access_token: <%= ENV['KITCHEN_GITHUB_TOKEN'] %> data_path: test/fixtures # disable file provider diffs so we don't overflow travis' line limit |