diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-11-28 15:00:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 15:00:23 -0800 |
| commit | 7078e449ab7e5564fb6d2d4a88e139fae576bd01 (patch) | |
| tree | a7db9b2ecd14545a39bf6c40bb5ebf48fbad00c7 | |
| parent | a4925e694eb0b7485b64ca4d092aaae158926a58 (diff) | |
| parent | 26b3e56205f1f26f5d7ec350803654cc8aa887b2 (diff) | |
| download | chef-7078e449ab7e5564fb6d2d4a88e139fae576bd01.tar.gz | |
Merge pull request #7998 from chef/lcg/kitchen-ohai-pinning2
better kithen ohai pinning
| -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 |