summaryrefslogtreecommitdiff
path: root/kitchen-tests/.kitchen.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to 'kitchen-tests/.kitchen.travis.yml')
-rw-r--r--kitchen-tests/.kitchen.travis.yml27
1 files changed, 13 insertions, 14 deletions
diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 100891bdf5..07a70fa47b 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -8,13 +8,13 @@ driver:
instance_type: "m3.medium"
provisioner:
- name: chef_github
- chef_omnibus_url: "https://omnitruck.chef.io/current/install.sh"
- chef_omnibus_install_options: "-n"
- github_owner: "chef"
- github_repo: "chef"
- refname: <%= ENV['TRAVIS_COMMIT'] %>
- github_access_token: <%= ENV['KITCHEN_GITHUB_TOKEN'] %>
+ name: chef_zero
+# chef_omnibus_url: "https://omnitruck.chef.io/current/install.sh"
+# chef_omnibus_install_options: "-n"
+# github_owner: "chef"
+# github_repo: "chef"
+# refname: <%= ENV['TRAVIS_COMMIT'] %>
+# github_access_token: <%= ENV['KITCHEN_GITHUB_TOKEN'] %>
data_path: test/fixtures
# disable file provider diffs so we don't overflow travis' line limit
client_rb:
@@ -24,19 +24,18 @@ transport:
ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
platforms:
- - name: ubuntu-12.04
+ - name: ubuntu-14.04
driver:
# http://cloud-images.ubuntu.com/locator/ec2/
- # 12.04 amd64 us-west-2 hvm:ssd
- image_id: ami-f3635fc3
- - name: rhel-6
+ # 14.04 amd64 us-west-2 hvm:ebs-ssd
+ image_id: ami-63ac5803
+ - name: centos-6
driver:
- # https://github.com/chef/releng-chef-repo/blob/master/script/ci#L93-L96
- image_id: ami-7df0bd4d
+ image_id: ami-05cf2265
suites:
- name: webapp
run_list:
- - recipe[apt::default]
+ - recipe[base::default]
- recipe[webapp::default]
attributes: