diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-05-12 09:11:14 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-05-12 09:11:14 -0700 |
| commit | 70e4bd2899da946d4bf0e7450c890ae28e76edbb (patch) | |
| tree | 80c14ba472fa8df52a0a6882b2d88118a02c555f | |
| parent | d77f4ae08963336e65314f22fe0d8f9e01ca1fd0 (diff) | |
| download | chef-70e4bd2899da946d4bf0e7450c890ae28e76edbb.tar.gz | |
fixing nits from PRlcg/kitchen-tests2
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.travis.yml | 4 | ||||
| -rw-r--r-- | kitchen-tests/.kitchen.yml | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index ac81f30aa4..2416a064f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -123,12 +123,11 @@ matrix: before_script: - cd kitchen-tests script: - # FIXME: we should fix centos-6 against AWS and then enable it here - - if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then bundle exec kitchen test ubuntu-1404 -l debug; fi + - if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then bundle exec kitchen test ubuntu-1404; fi after_failure: - cat .kitchen/logs/kitchen.log after_script: - - if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then bundle exec kitchen destroy ubuntu-1404 -l debug; fi + - if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then bundle exec kitchen destroy ubuntu-1404; fi env: - UBUNTU=1 - KITCHEN_YAML=.kitchen.travis.yml @@ -174,7 +173,6 @@ matrix: before_script: - cd kitchen-tests script: - # FIXME: we should fix centos-6 against AWS and then enable it here - if [ "$TRAVIS_SECURE_ENV_VARS" = "true" ]; then bundle exec kitchen test centos-6; fi after_failure: - cat .kitchen/logs/kitchen.log diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml index b8c486105b..682a1a5f68 100644 --- a/kitchen-tests/.kitchen.travis.yml +++ b/kitchen-tests/.kitchen.travis.yml @@ -9,8 +9,8 @@ driver: provisioner: name: chef_github - chef_omnibus_url: "https://omnitruck.chef.io/current/install.sh" - chef_omnibus_install_options: "-n" + chef_omnibus_url: "https://omnitruck.chef.io/install.sh" + chef_omnibus_install_options: "-c current" github_owner: "chef" github_repo: "chef" refname: <%= ENV['TRAVIS_COMMIT'] %> diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml index 095badd35a..af7ac3cde5 100644 --- a/kitchen-tests/.kitchen.yml +++ b/kitchen-tests/.kitchen.yml @@ -7,8 +7,8 @@ driver: provisioner: name: chef_github - chef_omnibus_url: "https://omnitruck.chef.io/current/install.sh" - chef_omnibus_install_options: "-n" + chef_omnibus_url: "https://omnitruck.chef.io/install.sh" + chef_omnibus_install_options: "-c current" github_owner: "chef" github_repo: "chef" refname: <%= %x(git rev-parse HEAD) %> |