diff options
| author | Matt Wrock <matt@mattwrock.com> | 2016-05-17 20:23:24 -0700 |
|---|---|---|
| committer | Matt Wrock <matt@mattwrock.com> | 2016-05-17 20:23:24 -0700 |
| commit | ac3e9d361359816370060100338303ae87630472 (patch) | |
| tree | d9abd39761b7d66e45471c3cea4bec8bd7869e46 | |
| parent | 31401fde70ea14f386a8abfe83caebe53427802b (diff) | |
| parent | e659885efcf90baeac2749e9663baff6fed9d605 (diff) | |
| download | chef-ac3e9d361359816370060100338303ae87630472.tar.gz | |
Merge pull request #4950 from chef/with_acceptance
With acceptance
| -rw-r--r-- | acceptance/Gemfile.lock | 2 | ||||
| -rw-r--r-- | acceptance/top-cookbooks/.kitchen.docker.yml | 2 | ||||
| -rwxr-xr-x | ci/verify-chef.sh | 41 |
3 files changed, 23 insertions, 22 deletions
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 108fb83509..774bd485d3 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/chef/chef-acceptance.git - revision: 4abda84e2fadd0452b77a8a88d4fd534843ced55 + revision: 47e931cec100dce8efae4369a5b03443eaf2b733 specs: chef-acceptance (0.2.0) mixlib-shellout (~> 2.0) diff --git a/acceptance/top-cookbooks/.kitchen.docker.yml b/acceptance/top-cookbooks/.kitchen.docker.yml index bea518cb29..41864e3608 100644 --- a/acceptance/top-cookbooks/.kitchen.docker.yml +++ b/acceptance/top-cookbooks/.kitchen.docker.yml @@ -5,5 +5,5 @@ suites: version: 1.10.0 run_list: - recipe[apt] - - recipe[apt-docker] + - recipe[chef-apt-docker] includes: [ubuntu-14.04] diff --git a/ci/verify-chef.sh b/ci/verify-chef.sh index 163673f000..71d4afe0df 100755 --- a/ci/verify-chef.sh +++ b/ci/verify-chef.sh @@ -87,26 +87,27 @@ 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 + + # 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 PATH=/opt/$PROJECT_NAME/bin:/opt/$PROJECT_NAME/embedded/bin:$PATH export PATH |