summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2017-05-10 10:24:49 +0100
committerThom May <thom@chef.io>2017-05-11 11:23:47 +0100
commit0b857d60eb23ac3cb855f17b9ed054cd99eab785 (patch)
treeeea43b626d7df14969ad2c0b304f14de4bfe99a7
parent90e1ba627612a0553a9156ed237d3afe73966f44 (diff)
downloadchef-tm/acceptance.tar.gz
Remove FIPS acceptance testingtm/acceptance
This has always been a pretty grotesque hack, and should be replaced with real testers running in FIPS mode natively. Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--acceptance/fips/.acceptance/acceptance-cookbook/.gitignore2
-rw-r--r--acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb2
-rw-r--r--acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb1
-rw-r--r--acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb1
-rw-r--r--acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb1
-rw-r--r--acceptance/fips/.kitchen.yml8
-rw-r--r--acceptance/fips/test/integration/fips-integration/serverspec/Gemfile9
-rw-r--r--acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb52
-rw-r--r--acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile7
-rw-r--r--acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb56
10 files changed, 0 insertions, 139 deletions
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/.gitignore b/acceptance/fips/.acceptance/acceptance-cookbook/.gitignore
deleted file mode 100644
index 041413b040..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-nodes/
-tmp/
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb b/acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb
deleted file mode 100644
index 6c754560f0..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/metadata.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-name "acceptance-cookbook"
-depends "kitchen_acceptance"
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb b/acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb
deleted file mode 100644
index e2d663ac2f..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/destroy.rb
+++ /dev/null
@@ -1 +0,0 @@
-kitchen "destroy"
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb b/acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb
deleted file mode 100644
index 5726c0e7b5..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/provision.rb
+++ /dev/null
@@ -1 +0,0 @@
-kitchen "converge"
diff --git a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb b/acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb
deleted file mode 100644
index 05ac94ce66..0000000000
--- a/acceptance/fips/.acceptance/acceptance-cookbook/recipes/verify.rb
+++ /dev/null
@@ -1 +0,0 @@
-kitchen "verify"
diff --git a/acceptance/fips/.kitchen.yml b/acceptance/fips/.kitchen.yml
deleted file mode 100644
index e78a3289d1..0000000000
--- a/acceptance/fips/.kitchen.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-suites:
- - name: fips-unit-functional
- includes: [centos-6]
- run_list:
-
- - name: fips-integration
- includes: [centos-6, windows-2012r2]
- run_list:
diff --git a/acceptance/fips/test/integration/fips-integration/serverspec/Gemfile b/acceptance/fips/test/integration/fips-integration/serverspec/Gemfile
deleted file mode 100644
index d297c4314d..0000000000
--- a/acceptance/fips/test/integration/fips-integration/serverspec/Gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-# Until https://github.com/test-kitchen/busser-serverspec/pull/42 is merged and
-# released, we need to include rake and rspec-core in the Gemfile
-gem "rake"
-gem "rspec-core"
-gem "busser-serverspec"
-gem "serverspec"
-gem "mixlib-shellout"
diff --git a/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb b/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb
deleted file mode 100644
index 2a087f8029..0000000000
--- a/acceptance/fips/test/integration/fips-integration/serverspec/fips-integration_spec.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require "mixlib/shellout"
-require "bundler"
-
-describe "Chef Fips Integration Specs" do
- def windows?
- if RUBY_PLATFORM =~ /mswin|mingw|windows/
- true
- else
- false
- end
- end
-
- let(:omnibus_root) do
- if windows?
- "c:/opscode/chef"
- else
- "/opt/chef"
- end
- end
-
- let(:env) do
- {
- "PATH" => [ "#{omnibus_root}/embedded/bin", ENV["PATH"] ].join(File::PATH_SEPARATOR),
- "BUNDLE_GEMFILE" => "#{omnibus_root}/Gemfile",
- "GEM_PATH" => nil, "GEM_CACHE" => nil, "GEM_HOME" => nil,
- "BUNDLE_IGNORE_CONFIG" => "true",
- "BUNDLE_FROZEN" => "1",
- "CHEF_FIPS" => "1"
- }
- end
-
- let(:chef_dir) do
- cmd = Mixlib::ShellOut.new("bundle show chef", env: env).run_command
- cmd.error!
- cmd.stdout.chomp
- end
-
- def run_rspec_test(test)
- Bundler.with_clean_env do
- cmd = Mixlib::ShellOut.new(
- "bundle exec rspec -f documentation -t ~requires_git #{test}",
- env: env, cwd: chef_dir, timeout: 3600
- )
- cmd.run_command.error!
- end
- end
-
- it "passes the integration specs" do
- skip
- #run_rspec_test("spec/integration")
- end
-end
diff --git a/acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile b/acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile
deleted file mode 100644
index 03c7a9e657..0000000000
--- a/acceptance/fips/test/integration/fips-unit-functional/serverspec/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-# Until https://github.com/test-kitchen/busser-serverspec/pull/42 is merged and
-# released, we need to include rake and rspec-core in the Gemfile
-gem "rake"
-gem "rspec-core"
-gem "mixlib-shellout"
diff --git a/acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb b/acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb
deleted file mode 100644
index 446261f83f..0000000000
--- a/acceptance/fips/test/integration/fips-unit-functional/serverspec/fips-unit-functional_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-require "mixlib/shellout"
-require "bundler"
-
-describe "Chef Fips Unit/Functional Specs" do
- def windows?
- if RUBY_PLATFORM =~ /mswin|mingw|windows/
- true
- else
- false
- end
- end
-
- let(:omnibus_root) do
- if windows?
- "c:/opscode/chef"
- else
- "/opt/chef"
- end
- end
-
- let(:env) do
- {
- "PATH" => [ "#{omnibus_root}/embedded/bin", ENV["PATH"] ].join(File::PATH_SEPARATOR),
- "BUNDLE_GEMFILE" => "#{omnibus_root}/Gemfile",
- "GEM_PATH" => nil, "GEM_CACHE" => nil, "GEM_HOME" => nil,
- "BUNDLE_IGNORE_CONFIG" => "true",
- "BUNDLE_FROZEN" => "1",
- "CHEF_FIPS" => "1"
- }
- end
-
- let(:chef_dir) do
- cmd = Mixlib::ShellOut.new("bundle show chef", env: env).run_command
- cmd.error!
- cmd.stdout.chomp
- end
-
- def run_rspec_test(test)
- Bundler.with_clean_env do
- cmd = Mixlib::ShellOut.new(
- "bundle exec rspec -f documentation -t ~requires_git #{test}",
- env: env, cwd: chef_dir, timeout: 3600
- )
- cmd.run_command.error!
- end
- end
-
- it "passes the unit specs" do
- run_rspec_test("spec/unit")
- end
-
- it "passes the functional specs" do
- run_rspec_test("spec/functional")
- end
-
-end