Cleanup Gemfiles, Berksfiles, and update Gemfile groups

Signed-off-by: Tom Duffield <tom@chef.io>

6 files changed, 8 insertions, 6 deletions

diff --git a/Gemfile b/Gemfile
index 5e8bc0d4ea..455d546248 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,9 +13,8 @@ gem "chef", path: "."
 
 gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
 # Ensure that we can always install rake, regardless of gem groups
-gem "rake", group: [ :default, :omnibus_package, :development ]
+gem "rake"
 gem "bundler"
-gem "cheffish"
 
 group(:omnibus_package) do
   gem "appbundler"
@@ -29,6 +28,7 @@ group(:omnibus_package, :pry) do
   gem "pry-remote"
   gem "pry-stack_explorer"
 end
+
 # These are used for external tests
 group(:integration) do
   gem "chef-provisioning"
@@ -63,6 +63,7 @@ group(:linux, :bsd, :mac_os_x, :solaris, :windows) do
   # may need to disable this in insolation on fussy builds like AIX, RHEL4, etc
   gem "ruby-prof"
 end
+
 # Everything except AIX and Windows
 group(:linux, :bsd, :mac_os_x, :solaris) do
   gem "ruby-shadow", platforms: :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index 02819d758b..984fdfe388 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -561,7 +561,6 @@ DEPENDENCIES
   chef-config!
   chef-provisioning
   chef-sugar
-  cheffish
   chefspec
   chefstyle!
   cucumber (>= 2.4.0)
diff --git a/ci/bundle_install.sh b/ci/bundle_install.sh
index 7f90f74964..973fcd48cc 100755
--- a/ci/bundle_install.sh
+++ b/ci/bundle_install.sh
@@ -5,5 +5,5 @@ set -evx
 gem environment
 bundler_version=$(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
 gem install bundler -v $bundler_version --user-install --conservative
-export BUNDLE_WITHOUT=default:omnibus_package:test:pry:integration:docgen:maintenance:travis:aix:bsd:linux:mac_os_x:solaris:windows
+export BUNDLE_WITHOUT=omnibus_package:test:pry:integration:docgen:maintenance:travis:aix:bsd:linux:mac_os_x:solaris:windows:development:changelog:travis
 bundle _${bundler_version}_ install
diff --git a/kitchen-tests/cookbooks/audit_test/Berksfile b/kitchen-tests/cookbooks/audit_test/Berksfile
index 0ac9b78cf7..967b9a78b6 100644
--- a/kitchen-tests/cookbooks/audit_test/Berksfile
+++ b/kitchen-tests/cookbooks/audit_test/Berksfile
@@ -1,3 +1,3 @@
-source "https://supermarket.getchef.com"
+source "https://supermarket.chef.io"
 
 metadata
diff --git a/kitchen-tests/cookbooks/webapp/Berksfile b/kitchen-tests/cookbooks/webapp/Berksfile
index 4b6079016e..ba11c46c1d 100644
--- a/kitchen-tests/cookbooks/webapp/Berksfile
+++ b/kitchen-tests/cookbooks/webapp/Berksfile
@@ -1,4 +1,4 @@
-source "https://api.berkshelf.com"
+source "https://supermarket.chef.io"
 
 metadata
 
diff --git a/version_policy.rb b/version_policy.rb
index 8e783bbedd..1253e91344 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -84,6 +84,8 @@ ACCEPTABLE_OUTDATED_GEMS = [
   "addressable",   # gh (via travis) wants this ~> 2.4.0
   "rake",       # poise limits this to < 12
   "github_changelog_generator", # we manage this independent of the rubygem
+  "cheffish",   # 5.0.0 breaks chef-provisioning
+  "net-ssh-gateway", # chef-provisiong and test-kitchen have ~> 1.2 constraint
 ]
 
 #