diff options
Diffstat (limited to 'ci/verify-chef.sh')
| -rwxr-xr-x | ci/verify-chef.sh | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh index 3a9bcf2111..3db37a5cf6 100755 --- a/ci/verify-chef.sh +++ b/ci/verify-chef.sh @@ -94,29 +94,6 @@ gem_list=`gem which chef` lib_dir=`dirname $gem_list` CHEF_GEM=`dirname $lib_dir` -# ACCEPTANCE environment variable will be set on acceptance testers. -# 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. - 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 - - # copy acceptance suites into workspace - SUITE_PATH=$WORKSPACE/acceptance - mkdir -p $SUITE_PATH - cp -R $CHEF_GEM/acceptance/. $SUITE_PATH - sudo chown -R $USER:$USER $SUITE_PATH - - cd $SUITE_PATH - - 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 - cd $CHEF_GEM - sudo bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional -fi +cd $CHEF_GEM +sudo bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o $WORKSPACE/test.xml -f documentation spec/functional |