summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-04-19 12:30:34 -0700
committerJohn Keiser <john@johnkeiser.com>2016-04-19 12:30:34 -0700
commita8fdb648081d90c07a6acea3cfa73724fdc3796c (patch)
treef86232a9aa0bad357c55ec6206b4e30c7839d182
parentb5d8c482183e9487c9572df8aad26d8a93b1a50f (diff)
parentbc4156f6b7735275e23fd82895c081c1aa3da83a (diff)
downloadchef-a8fdb648081d90c07a6acea3cfa73724fdc3796c.tar.gz
Merge pull request #4846 from chef/jk/use-ssl-again
Turn off GIT_SSL_NO_VERIFY
-rwxr-xr-xci/verify-chef.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh
index 8118d2da33..bf72e03cc3 100755
--- a/ci/verify-chef.sh
+++ b/ci/verify-chef.sh
@@ -100,7 +100,6 @@ if [ "x$ACCEPTANCE" != "x" ]; then
export PATH
# Test against the Chef bundle
- # sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD gem install bundler
sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD pwd
sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD bundle config
sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD bundle install
@@ -124,6 +123,5 @@ else
CHEF_FIPS=1
export CHEF_FIPS
fi
-
- sudo env BUNDLE_GEMFILE=/opt/$PROJECT_NAME/Gemfile BUNDLE_IGNORE_CONFIG=true BUNDLE_FROZEN=1 GIT_SSL_NO_VERIFY=true 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 CHEF_FIPS=$CHEF_FIPS bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional
fi