Run the intergration tests in FIPS mode

3 files changed, 2 insertions, 57 deletions

diff --git a/acceptance/fips/test/integration/fips/serverspec/fips_spec.rb b/acceptance/fips/test/integration/fips/serverspec/fips_spec.rb
index 4f408cd063..29b322ac05 100644
--- a/acceptance/fips/test/integration/fips/serverspec/fips_spec.rb
+++ b/acceptance/fips/test/integration/fips/serverspec/fips_spec.rb
@@ -38,7 +38,7 @@ describe "Chef Fips Specs" do
   it "passes the unit and functional specs" do
     Bundler.with_clean_env do
       cmd = Mixlib::ShellOut.new(
-        "bundle exec rspec -t ~requires_git spec/unit spec/functional",
+        "bundle exec rspec -t ~requires_git spec/unit spec/functional spec/integration",
         env: env, live_stream: STDOUT, cwd: chef_dir, timeout: 3600
       )
       cmd.run_command.error!
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh
index bf72e03cc3..6c6c4606de 100755
--- a/ci/verify-chef.sh
+++ b/ci/verify-chef.sh
@@ -117,11 +117,5 @@ else
     exit 1
   fi
 
-  unset CHEF_FIPS
-  if [ "$PIPELINE_NAME" = "chef-fips" ]; then
-      echo "Setting fips mode"
-      CHEF_FIPS=1
-      export CHEF_FIPS
-  fi
-  sudo env BUNDLE_GEMFILE=/opt/$PROJECT_NAME/Gemfile BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 PATH=$PATH TERM=xterm CHEF_FIPS=$CHEF_FIPS bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional
+  sudo env BUNDLE_GEMFILE=/opt/$PROJECT_NAME/Gemfile BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 PATH=$PATH TERM=xterm bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional
 fi
diff --git a/omnibus/config/projects/chef-fips.rb b/omnibus/config/projects/chef-fips.rb
deleted file mode 100644
index dfe1a9e13a..0000000000
--- a/omnibus/config/projects/chef-fips.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright 2012-2016, Chef Software, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# This is the chef client build with FIPS mode enabled.
-#
-current_file = __FILE__
-chef_project_contents = IO.read(File.expand_path("../chef.rb", current_file))
-self.instance_eval chef_project_contents
-
-name "chef-fips"
-friendly_name "Chef Client with FIPS OpenSSL"
-
-if windows?
-  # NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files"
-  #       Native gems will use gcc which will barf on files with spaces,
-  #       which is only fixable if everyone in the world fixes their Makefiles
-  install_dir "#{default_root}/opscode/#{name}"
-  package_name "chef-fips"
-else
-  install_dir "#{default_root}/#{name}"
-end
-
-override :ruby, version: "2.1.7"
-
-# Global FIPS override flag.
-override :fips, enabled: true
-
-override :chef, version: "local_source"
-override :ohai, version: "master"
-
-msi_upgrade_code = "819F5DB3-B818-4358-BB2B-54B8171D0A26"
-project_location_dir = "chef-fips"
-
-# Use chef's scripts for everything.
-resources_path "#{resources_path}/../chef"