summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorSeth Chisamore <schisamo@chef.io>2016-05-17 14:18:01 -0400
committerSeth Chisamore <schisamo@chef.io>2016-05-17 14:18:01 -0400
commitb8cef53989826bed36e3abca352f2e57d3cf0c22 (patch)
tree8030301cce4e37cc591a1d214f9a2be6e67c1236 /ci
parent31401fde70ea14f386a8abfe83caebe53427802b (diff)
downloadchef-b8cef53989826bed36e3abca352f2e57d3cf0c22.tar.gz
Revert "exit 0 -- its how acceptance works"
This reverts commit aac62e28ae3112c586f223c48ef7fe360f98e56a.
Diffstat (limited to 'ci')
-rwxr-xr-xci/verify-chef.sh39
1 files changed, 19 insertions, 20 deletions
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh
index 163673f000..00dad02f3d 100755
--- a/ci/verify-chef.sh
+++ b/ci/verify-chef.sh
@@ -87,26 +87,25 @@ export FORCE_FFI_YAJL
# If is it set; we run the acceptance tests, otherwise run rspec tests.
if [ "x$ACCEPTANCE" != "x" ]; then
# Find the Chef gem and cd there.
- # OLD_PATH=$PATH
- # PATH=/opt/$PROJECT_NAME/bin:/opt/$PROJECT_NAME/embedded/bin:$PATH
- # cd /opt/$PROJECT_NAME
- # CHEF_GEM=`bundle show chef`
- # PATH=$OLD_PATH
-
- # # On acceptance testers we have Chef DK. We will use its Ruby environment
- # # to cut down the gem installation time.
- # PATH=/opt/chefdk/bin:/opt/chefdk/embedded/bin:$PATH
- # export PATH
-
- # # Test against the Chef bundle
- # env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID pwd
- # # Force `$WORKSPACE/.bundle/config` to be created so bundler doesn't
- # # attempt to create the file up in the `$CHEF_GEM/acceptance/`. This
- # # saves us from having to add a `sudo` to any of the `bundle` commands.
- # env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID bundle config --local gemfile $CHEF_GEM/acceptance/Gemfile
- # env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID bundle install --deployment
- # env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID KITCHEN_DRIVER=ec2 KITCHEN_CHEF_CHANNEL=unstable bundle exec chef-acceptance test --force-destroy --data-path $WORKSPACE/chef-acceptance-data
- exit 0
+ OLD_PATH=$PATH
+ PATH=/opt/$PROJECT_NAME/bin:/opt/$PROJECT_NAME/embedded/bin:$PATH
+ cd /opt/$PROJECT_NAME
+ CHEF_GEM=`bundle show chef`
+ PATH=$OLD_PATH
+
+ # On acceptance testers we have Chef DK. We will use its Ruby environment
+ # to cut down the gem installation time.
+ PATH=/opt/chefdk/bin:/opt/chefdk/embedded/bin:$PATH
+ export PATH
+
+ # Test against the Chef bundle
+ env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID pwd
+ # Force `$WORKSPACE/.bundle/config` to be created so bundler doesn't
+ # attempt to create the file up in the `$CHEF_GEM/acceptance/`. This
+ # saves us from having to add a `sudo` to any of the `bundle` commands.
+ env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID bundle config --local gemfile $CHEF_GEM/acceptance/Gemfile
+ env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID bundle install --deployment
+ env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID KITCHEN_DRIVER=ec2 KITCHEN_CHEF_CHANNEL=unstable bundle exec chef-acceptance test --force-destroy --data-path $WORKSPACE/chef-acceptance-data
else
PATH=/opt/$PROJECT_NAME/bin:/opt/$PROJECT_NAME/embedded/bin:$PATH
export PATH