Use kitchen-appbundle-updaterjdm/kitchen-appbundle

3 files changed, 28 insertions, 32 deletions

diff --git a/kitchen-tests/.kitchen.travis.yml b/kitchen-tests/.kitchen.travis.yml
index 15795e033a..08a2dc2b33 100644
--- a/kitchen-tests/.kitchen.travis.yml
+++ b/kitchen-tests/.kitchen.travis.yml
@@ -1,35 +1,36 @@
 ---
-driver_config:
+driver:
+  name: ec2
   aws_access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %>
   aws_secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
   aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %>
-  iam_profile_name: <%= ENV['IAM_PROFILE_NAME'] %>
+  region: "us-west-2"
+  availability_zone: "us-west-2a"
+  security_group_ids: ["travis-ci"]
+
 
 provisioner:
-  name: chef_zero
-  github: <%= ENV['TRAVIS_REPO_SLUG'] %>
-  branch: <%= ENV['TRAVIS_COMMIT'] %>
-  require_chef_omnibus: 12.0.0-rc.2
+  name: chef_github
+  github_owner: "chef"
+  github_repo: "chef"
+  refname: <%= ENV['TRAVIS_COMMIT'] %>
   data_path: test/fixtures
 # disable file provider diffs so we don't overflow travis' line limit
   client_rb:
     diff_disabled: true
 
+transport:
+  ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
+
 platforms:
   - name: ubuntu-12.04
-    driver_plugin: ec2
-    driver_config:
-      region: "us-west-2"
-      availability_zone: "us-west-2a"
-      ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-      security_group_ids: ["travis-ci"]
-  - name: centos-6.4
-    driver_plugin: ec2
-    driver_config:
-      region: "us-west-2"
-      availability_zone: "us-west-2a"
-      ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-      security_group_ids: ["travis-ci"]
+    driver:
+      # http://cloud-images.ubuntu.com/locator/ec2/
+      image_id: ami-c15379f1
+  - name: rhel-6
+    driver:
+      # https://github.com/chef/releng-chef-repo/blob/master/script/ci#L93-L96
+      image_id: ami-7df0bd4d
 
 suites:
   - name: webapp
diff --git a/kitchen-tests/.kitchen.yml b/kitchen-tests/.kitchen.yml
index 775bb59378..c853f51b8d 100644
--- a/kitchen-tests/.kitchen.yml
+++ b/kitchen-tests/.kitchen.yml
@@ -6,10 +6,10 @@ driver:
     memory: 2048
 
 provisioner:
-  name: chef_zero
-  github: "opscode/chef"
-  branch: <%= %x(git rev-parse HEAD) %>
-  require_chef_omnibus: true
+  name: chef_github
+  github_owner: "chef"
+  github_repo: "chef"
+  refname: <%= %x(git rev-parse HEAD) %>
   data_path: test/fixtures
   client_rb:
     diff_disabled: true
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index 60df7ef388..c4ad758c36 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -2,13 +2,8 @@ source "https://rubygems.org"
 
 group :end_to_end do
   gem 'berkshelf'
-  # Once merged into test-kitchen/test-kitchen:master we can remove
-  # this and replace it with
-  # gem 'test-kitchen', :github => 'test-kitchen/test-kitchen'
-  # until the next test-kitchen gem release.
-  gem 'test-kitchen', :github => 'mcquin/test-kitchen',
-                      :branch => 'mcquin/install_chef_from_github'
-
-  gem 'kitchen-vagrant' # Used for local testing
-  gem 'kitchen-ec2'     # Used for remote (Travis) testing
+  gem 'test-kitchen', '~> 1.4.0.rc.1'
+  gem 'kitchen-appbundle-updater', '~> 0.0.1'
+  gem "kitchen-vagrant", '~> 0.17.0.beta.2'
+  gem 'kitchen-ec2', :github => 'test-kitchen/kitchen-ec2'
 end