diff options
| author | Seth Chisamore <schisamo@chef.io> | 2016-05-13 16:54:11 -0400 |
|---|---|---|
| committer | Seth Chisamore <schisamo@chef.io> | 2016-05-13 16:54:11 -0400 |
| commit | ff07fdbcb130864e3b8d891604e2a08ecc03eb89 (patch) | |
| tree | c591780a62263ab5f4c9dbaf1764474f7435ae54 | |
| parent | deee933b737cc72c0dc672eb51a2e44e223e5fda (diff) | |
| parent | 4b96680ef656f2def0d1fbe9dd4f1c9b580a511d (diff) | |
| download | chef-ff07fdbcb130864e3b8d891604e2a08ecc03eb89.tar.gz | |
Merge pull request #4932 from chef/schisamo/fix-acceptance-archiving
Execute chef-acceptance without elevated privileges
| -rwxr-xr-x | ci/verify-chef.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh index 1f2413a07e..00dad02f3d 100755 --- a/ci/verify-chef.sh +++ b/ci/verify-chef.sh @@ -92,7 +92,6 @@ if [ "x$ACCEPTANCE" != "x" ]; then cd /opt/$PROJECT_NAME CHEF_GEM=`bundle show chef` PATH=$OLD_PATH - cd $CHEF_GEM/acceptance # On acceptance testers we have Chef DK. We will use its Ruby environment # to cut down the gem installation time. @@ -100,10 +99,13 @@ if [ "x$ACCEPTANCE" != "x" ]; then export PATH # Test against the Chef bundle - sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID pwd - sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID bundle config - sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID bundle install - sudo 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 + 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 |