diff options
| -rwxr-xr-x | ci/verify-chef.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh index 00dad02f3d..71d4afe0df 100755 --- a/ci/verify-chef.sh +++ b/ci/verify-chef.sh @@ -98,12 +98,14 @@ if [ "x$ACCEPTANCE" != "x" ]; then 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 + # 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 |