More kitchen updates

Signed-off-by: Tim Smith <tsmith@chef.io>

6 files changed, 1 insertions, 45 deletions

diff --git a/kitchen-tests/cookbooks/end_to_end/Berksfile b/kitchen-tests/cookbooks/end_to_end/Berksfile
deleted file mode 100644
index 967b9a78b6..0000000000
--- a/kitchen-tests/cookbooks/end_to_end/Berksfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://supermarket.chef.io"
-
-metadata
diff --git a/kitchen-tests/cookbooks/end_to_end/metadata.rb b/kitchen-tests/cookbooks/end_to_end/metadata.rb
index 83cea5c9a8..9394d16408 100644
--- a/kitchen-tests/cookbooks/end_to_end/metadata.rb
+++ b/kitchen-tests/cookbooks/end_to_end/metadata.rb
@@ -20,7 +20,7 @@ depends          "git"
 supports         "ubuntu"
 supports         "debian"
 supports         "centos"
-supports         "opensuse"
+supports         "opensuseleap"
 supports         "fedora"
 supports         "amazon"
 
diff --git a/kitchen-tests/cookbooks/rspec/metadata.rb b/kitchen-tests/cookbooks/rspec/metadata.rb
deleted file mode 100644
index 56fb816ce4..0000000000
--- a/kitchen-tests/cookbooks/rspec/metadata.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-name             "rspec"
-license          "Apache-2.0"
-description      "Utility cookbook for rspec testing"
-version          "1.0.0"
-
-chef_version     ">= 14"
-issues_url       "https://github.com/chef/chef/issues"
-source_url       "https://github.com/chef/chef"
diff --git a/kitchen-tests/cookbooks/rspec/recipes/default.rb b/kitchen-tests/cookbooks/rspec/recipes/default.rb
deleted file mode 100644
index 4dc1c10d99..0000000000
--- a/kitchen-tests/cookbooks/rspec/recipes/default.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# we're using chef-client now as a glorified way to push a file to the remote host
-# if we had a way to turn off chef-client converge and push arbitrary files to the
-# remote this complexity could be removed.
-template "/usr/local/bin/run-chef-rspec" do
-  source "run-chef-rspec"
-  mode 0755
-end
-
-# do NOT even think of trying to add an execute resource here to launch rspec.
-# chefception is proven to be a bad idea, and the rspec tests that really launch
-# chef-client will likely break due to the outer chef-client run.  i also do not
-# want to debug rspec's output being filtered through chef-client's logger -- fuck
-# all of that noise.
diff --git a/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec b/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec
deleted file mode 100644
index 54c4297479..0000000000
--- a/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# remove ip6 entries for docker
-egrep -v "ip6" /etc/hosts > /etc/hosts.new
-cp /etc/hosts.new /etc/hosts
-
-export PATH=/opt/chef/embedded/bin:$PATH
-cd /opt/chef/embedded/apps/chef
-
-/opt/chef/embedded/bin/bundle install
-/opt/chef/embedded/bin/bundle exec /opt/chef/embedded/bin/rspec --format progress
diff --git a/omnibus/kitchen.yml b/omnibus/kitchen.yml
index aad8222c58..8921ec080a 100644
--- a/omnibus/kitchen.yml
+++ b/omnibus/kitchen.yml
@@ -39,8 +39,6 @@ platforms:
     run_list: apt::default
   - name: freebsd-11
     run_list: freebsd::portsnap
-  - name: ubuntu-14.04
-    run_list: apt::default
   - name: ubuntu-16.04
     run_list: apt::default
   - name: ubuntu-18.04
@@ -127,13 +125,6 @@ platforms:
   <% end %>
 
 suites:
-  # - name: angrychef
-  #   attributes:
-  #     omnibus:
-  #       <<: *attribute_defaults
-  #       install_dir: /opt/angrychef
-  #   run_list:
-  #     - omnibus::default
   - name: chef
     attributes:
       omnibus: