summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2016-12-02 16:33:02 -0600
committerGitHub <noreply@github.com>2016-12-02 16:33:02 -0600
commita539b3895839ab149041a336fa62b1dc71433bb1 (patch)
tree7af0bd227db2d00e26f63c21345305d7f2163832
parent7d77c339a058cc923e3487d2e71ac6c4651e300c (diff)
parent63fa34d051f322006c99e0885506d5a4f8110c7f (diff)
downloadchef-a539b3895839ab149041a336fa62b1dc71433bb1.tar.gz
Merge pull request #5610 from chef/tduffield/use-chef-docker-image
Use chef/chef image instead of downloading from packages.chef.io
-rw-r--r--kitchen-tests/.kitchen.travis.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index d0e17efa8c..aae5202457 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -2,7 +2,8 @@
driver:
name: dokken
privileged: true
- chef_version: latest
+ chef_image: chef/chef
+ chef_version: current
transport:
name: dokken
@@ -10,9 +11,6 @@ transport:
provisioner:
name: chef_github
root_path: /opt/kitchen
- require_chef_omnibus: latest
- 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'] %>