Merge pull request #8741 from chef/modern_spec_runner

Remove the unused rspec kitchen tests

5 files changed, 0 insertions, 40 deletions

diff --git a/kitchen-tests/Berksfile b/kitchen-tests/Berksfile
index d699452ebe..50e09ebf3b 100644
--- a/kitchen-tests/Berksfile
+++ b/kitchen-tests/Berksfile
@@ -1,4 +1,3 @@
 source "https://supermarket.chef.io"
 
 cookbook "end_to_end", path: "cookbooks/end_to_end"
-cookbook "rspec", path: "cookbooks/rspec"
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 4063c571e4..0000000000
--- a/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec
+++ /dev/null
@@ -1,12 +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
-export CHEF_LICENSE="accept-no-persist"
-/opt/chef/embedded/bin/bundle exec /opt/chef/embedded/bin/rspec --format progress
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 944767eada..ec842b8f4a 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -114,9 +114,3 @@ suites:
   - name: end-to-end
     run_list:
       - recipe[end_to_end::default]
-  - name: rspec
-    run_list:
-      - recipe[rspec]
-    lifecycle:
-      post_converge:
-        - remote: /usr/local/bin/run-chef-rspec