summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authortyler-ball <tball@chef.io>2019-04-22 15:41:03 -0600
committerMark Anderson <mark@chef.io>2019-05-03 21:40:19 -0700
commitc99eef4077655ce0a8db87d7c9ead1017ec7dad7 (patch)
treedceb9dd0fdae49adfe5571a4bbcc92e98400245a /kitchen-tests
parenta8dcabbb4a527816d4d19784fe2011dad28c470b (diff)
downloadchef-c99eef4077655ce0a8db87d7c9ead1017ec7dad7.tar.gz
Adding license acceptance support to 'knife bootstrap'
Signed-off-by: tyler-ball <tball@chef.io>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/Berksfile1
-rw-r--r--kitchen-tests/Gemfile4
2 files changed, 2 insertions, 3 deletions
diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index df9f0427e6..d699452ebe 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -2,4 +2,3 @@ source "https://supermarket.chef.io"
cookbook "end_to_end", path: "cookbooks/end_to_end"
cookbook "rspec", path: "cookbooks/rspec"
-cookbook "chef-client", git: "https://github.com/tyler-ball/chef-client.git", branch: "chef_license_accept"
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index a8d064fb80..a1a438d071 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -6,5 +6,5 @@ gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" # avoids f
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"
-gem "inspec", git: "https://github.com/inspec/inspec.git", branch: "master" # this goes away when we ship inspec 4
-gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "chef_license_accept"
+gem "inspec"
+gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "master"