summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2016-01-26 19:22:08 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2016-01-26 19:22:08 -0800
commit490aee527802ba149b68cb4ead1db2cf73006ec7 (patch)
tree3ef4a959a6d0f2132b3e8a890bdb7aed510d7d69 /ci
parent58112e1210cac991e7a9cf434c74ece0aa97414d (diff)
downloadchef-490aee527802ba149b68cb4ead1db2cf73006ec7.tar.gz
Fix bug in sh script that runs test in jenkinsjdm/fix-pipeline
Some testers fail with ``` ci/verify-chef.sh: test: ] missing` ``` This regression was introduced by https://github.com/chef/chef/commit/2bcb7d06dcb49c953b9e666b24c8bd3cb56da2c5
Diffstat (limited to 'ci')
-rwxr-xr-xci/verify-chef.sh7
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