summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Chisamore <schisamo@chef.io>2016-05-10 14:10:46 -0400
committerSeth Chisamore <schisamo@chef.io>2016-05-10 14:10:46 -0400
commit6fe31094c894780116d8438c040e04632d9d01c0 (patch)
tree55d691c7b7ed5948cc32a011abc3f672c3f7e518
parent5e2678c8e359bc8e72a42ae369f557672c27744c (diff)
parentc74a1de0731bf673ffd6321dad4051abfaf11461 (diff)
downloadchef-6fe31094c894780116d8438c040e04632d9d01c0.tar.gz
Merge pull request #4917 from chef/schisamo/update-acceptance-data-dir
relocate chef-acceptance data output to Jenkins workspace
-rwxr-xr-xci/verify-chef.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh
index 6c6c4606de..1f2413a07e 100755
--- a/ci/verify-chef.sh
+++ b/ci/verify-chef.sh
@@ -100,10 +100,10 @@ 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 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
- sudo env PATH=$PATH AWS_SSH_KEY_ID=$AWS_SSH_KEY_ID ARTIFACTORY_USERNAME=$ARTIFACTORY_USERNAME ARTIFACTORY_PASSWORD=$ARTIFACTORY_PASSWORD KITCHEN_DRIVER=ec2 bundle exec chef-acceptance test --force-destroy
+ 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
else
PATH=/opt/$PROJECT_NAME/bin:/opt/$PROJECT_NAME/embedded/bin:$PATH
export PATH