From 52ed18f9d568a4c629cae0e2ca31323a1ed7de38 Mon Sep 17 00:00:00 2001
From: Christoph Hartmann <chris@lollyrock.com>
Date: Fri, 29 Jan 2016 13:20:39 +0100
Subject: [PATCH] update ec2 kitchen yml

---
 README.md                         |  3 ++-
 test/integration/.kitchen.ec2.yml | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 993adeb9e..507a959fd 100644
--- a/README.md
+++ b/README.md
@@ -230,7 +230,8 @@ bundle exec kitchen test
 ```bash
 export AWS_ACCESS_KEY_ID=enteryouryourkey
 export AWS_SECRET_ACCESS_KEY=enteryoursecreykey
-export AWS_SSH_KEY_ID=enteryoursshkeyid
+export AWS_KEYPAIR_NAME=enteryoursshkeyid
+export EC2_SSH_KEY_PATH=~/.ssh/id_aws.pem
 cd test/integration
 KITCHEN_LOCAL_YAML=.kitchen.ec2.yml bundle exec kitchen test
 ```
diff --git a/test/integration/.kitchen.ec2.yml b/test/integration/.kitchen.ec2.yml
index 16e6eb136..1990fdaa3 100644
--- a/test/integration/.kitchen.ec2.yml
+++ b/test/integration/.kitchen.ec2.yml
@@ -1,23 +1,29 @@
 driver:
   name: ec2
   region: eu-central-1
-  instance_type: m3.large
+  instance_type: m3.medium
   associate_public_ip: true
+  security_group_ids: ["travis-ci"]
   interface: dns
 
 transport:
-  ssh_key: /path/to/aws.pem
   username: ec2-user
+  ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
 
 platforms:
+  - name: windows-2008
+    driver:
+      image_id: ami-58918e34
+    transport:
+      username: administrator
   - name: windows-2012
     driver:
-      image_id: ami-58f7fb45
+      image_id: ami-44918e28
     transport:
       username: administrator
   - name: windows-2012r2
     driver:
-      image_id: ami-f2f5f9ef
+      image_id: ami-8a918ee6
     transport:
       username: administrator
   - name: suse-11sp3