diff options
| author | Thom May <thom@may.lt> | 2016-01-27 14:07:23 +0000 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2016-01-27 14:07:23 +0000 |
| commit | 58eff3ad063fb44f14d77239085a9be85325235f (patch) | |
| tree | 4627db9343a0d095453e9c779ebdd678cad0a5b0 | |
| parent | b7e7f425b27d011d358b17c5f7ba61473dbb3308 (diff) | |
| parent | 490aee527802ba149b68cb4ead1db2cf73006ec7 (diff) | |
| download | chef-58eff3ad063fb44f14d77239085a9be85325235f.tar.gz | |
Merge pull request #4466 from chef/jdm/fix-pipeline
Fix bug in sh script that runs test in jenkins
| -rwxr-xr-x | ci/verify-chef.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh index 1e384c7018..7d7ce08608 100755 --- a/ci/verify-chef.sh +++ b/ci/verify-chef.sh @@ -86,9 +86,10 @@ if [ ! -f "Gemfile.lock" ]; then exit 1 fi -CHEF_FIPS=0 -if [ $PIPELINE_NAME='chef-fips']; -then +unset CHEF_FIPS +if [ $PIPELINE_NAME="chef-fips" ]; then + echo "Setting fips mode" CHEF_FIPS=1 + export CHEF_FIPS 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 |