diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-01-22 15:17:47 -0800 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2016-01-25 09:54:21 -0800 |
| commit | 2bcb7d06dcb49c953b9e666b24c8bd3cb56da2c5 (patch) | |
| tree | ae6477881ee95b51722a533cad0d04c4653f1267 | |
| parent | 6f369e4b5d7bee4b347c866a7c1d5bbca0492326 (diff) | |
| download | chef-2bcb7d06dcb49c953b9e666b24c8bd3cb56da2c5.tar.gz | |
export CHEF_FIPS=1 in the chef-fips jenkins pipeline
| -rwxr-xr-x | ci/verify-chef.bat | 3 | ||||
| -rwxr-xr-x | ci/verify-chef.sh | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ci/verify-chef.bat b/ci/verify-chef.bat index 1c159f0668..2c16eb83f6 100755 --- a/ci/verify-chef.bat +++ b/ci/verify-chef.bat @@ -52,5 +52,8 @@ IF "%PIPELINE_NAME%" == "chef-13" ( call bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/unit spec/functional ) ELSE ( REM ; Running unit tests + IF "%PIPELINE_NAME%" == "chef-fips" ( + set CHEF_FIPS=1 + ) call bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/unit spec/functional ) diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh index 4e60b1fd9f..1e384c7018 100755 --- a/ci/verify-chef.sh +++ b/ci/verify-chef.sh @@ -86,4 +86,9 @@ if [ ! -f "Gemfile.lock" ]; then exit 1 fi -sudo env PATH=$PATH TERM=xterm bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional spec/unit +CHEF_FIPS=0 +if [ $PIPELINE_NAME='chef-fips']; +then + CHEF_FIPS=1 +fi +sudo env 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 spec/unit |