summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-11-27 13:28:11 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2018-11-27 13:28:11 -0800
commitb687f11901fffa8ee570e431268600a25a8c06f0 (patch)
treeefce731115571fbc4a7a428d71b93712e41c3cba /kitchen-tests
parentfb37f4e97dcd857d85ce21f069480d4595ba8f93 (diff)
downloadchef-b687f11901fffa8ee570e431268600a25a8c06f0.tar.gz
pull the ohai version from the bundle not from master
should fix issues with kitchen tests breaking in travis after we merge to ohai Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/kitchen.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml
index 06b789a3c2..55427c466d 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: "master"
+ ohai_refname: "<%= "v" + `bundle exec ohai --version`.split(/\s+/)[1] %>"
github_access_token: <%= ENV['KITCHEN_GITHUB_TOKEN'] %>
data_path: test/fixtures
# disable file provider diffs so we don't overflow travis' line limit