diff options
| author | Tim Smith <tsmith@chef.io> | 2018-01-19 20:30:02 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-01-19 20:30:02 -0800 |
| commit | cec87a86852b425a9af4362c4115fa0772386743 (patch) | |
| tree | b9ba9b6edbe5e6d45ad556601d20cb2ce94a9be2 /kitchen-tests | |
| parent | 9dd2aac3adefaf56bbd828b058b8baafbbcc9f3d (diff) | |
| download | chef-cec87a86852b425a9af4362c4115fa0772386743.tar.gz | |
Actually bump the version to 14 and dep on chef-config / ohai 14tm/branch_14
Without this the kitchen tests fail as there isn't a chef-config build at ~14.0. Ohai has been bumped to 14 and the chef-config dep updated to 14. For now we have to use builds from master since we don't have a gem. I left notes that we can remove those in the future.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'kitchen-tests')
| -rw-r--r-- | kitchen-tests/Gemfile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 144363b4ae..9cc63fb7d6 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -2,6 +2,8 @@ source "https://rubygems.org" gem "rake" # required to build some native extensions gem "chef", path: ".." +# remove this ohai pin once we ship the 14 gem +gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master" gem "kitchen-appbundle-updater", git: "https://github.com/chef/kitchen-appbundle-updater", branch: "master" gem "kitchen-dokken", "< 2.0" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787 |