summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-01-17 13:40:26 -0800
committerTim Smith <tsmith84@gmail.com>2020-01-17 13:40:26 -0800
commit821f19c805eafcc68801b5ea5417ffd401a396e7 (patch)
tree44512d0e1e64723b9c9e777e7c86625379406496 /kitchen-tests
parent3c692f4dfa6f61d2bcd8f7c9ba5b6f188559af11 (diff)
downloadchef-821f19c805eafcc68801b5ea5417ffd401a396e7.tar.gz
Prep the chef-15 branch to build stable releases
It's entirely possible that more work is required, but this is the bare minimum we need to start building. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/Gemfile2
-rw-r--r--kitchen-tests/kitchen.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index a1a438d071..151af64fac 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
gem "rake" # required to build some native extensions
gem "chef", path: ".."
-gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" # avoids failures when we bump chef major
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "15-stable" # avoids failures when we bump chef major
gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master"
gem "kitchen-dokken", "~> 2.0"
gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master"
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index e5c6869467..c93e24197f 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -3,7 +3,7 @@ driver:
name: dokken
privileged: true
chef_image: chef/chef
- chef_version: current
+ chef_version: 15
transport:
name: dokken