Merge pull request sous-chefs#199 from chef-cookbooks/cloud_testing

Rework the kitchen cloud config
CheggEng · Jan 21, 2016 · 87dc3af · 87dc3af
2 parents f6ff0ab + 9f51790
commit 87dc3af
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 69 deletions.
diff --git a/.kitchen.cloud.yml b/.kitchen.cloud.yml
@@ -1,67 +1,50 @@
----
 driver_config:
-  aws_access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %>
-  aws_secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
+  name: ec2
   aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %>
-  availability_zone: <%= ENV['AWS_AVAILABILITY_ZONE'] %>
+  region: us-west-2
+  availability_zone: us-west-2a
+
+transport:
+  ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
 
 provisioner:
   name: chef_zero
 
 platforms:
-- name: amazon-2014.09
-  driver_plugin: ec2
+- name: amazon-2015.09
   driver_config:
-    image_id: ami-50842d38
+    image_id: ami-f0091d91
+    instance_type: t2.small
+  transport:
     username: ec2-user
-    ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-    flavor_id: m1.small
 
-- name: ubuntu-12.04
-  driver_plugin: ec2
+- name: redhat-7.2
   driver_config:
-    image_id: ami-2ccc7a44
-    username: ubuntu
-    ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-    flavor_id: m1.small
+    image_id: ami-775e4f16
+    instance_type: t2.small
+  transport:
+    username: ec2-user
 
-- name: ubuntu-12.04-hvm
-  driver_plugin: ec2
+- name: ubuntu-12.04
   driver_config:
-    image_id: ami-3ccc7a54
+    image_id: ami-6cb4ae0d
+    instance_type: t2.small
+  transport:
     username: ubuntu
-    ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-    flavor_id: t2.small
 
 - name: ubuntu-14.04
-  driver_plugin: ec2
   driver_config:
-    image_id: ami-8caa1ce4
+    image_id: ami-22b9a343
+    instance_type: t2.small
+  transport:
     username: ubuntu
-    ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-    flavor_id: m1.small
-
-- name: ubuntu-14.04-hvm
-  driver_plugin: ec2
-  driver_config:
-    image_id: ami-9aaa1cf2
-    username: ubuntu
-    ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-    flavor_id: t2.small
-
-- name: amazon-2014.09-hvm
-  driver_plugin: ec2
-  driver_config:
-    image_id: ami-fccc6d94
-    username: ec2-user
-    ssh_key: <%= ENV['EC2_SSH_KEY_PATH'] %>
-    flavor_id: t2.small
 
 suites:
 
   - name: default
     run_list:
-    - recipe[aws]
+    - recipe[aws::default]
+    - recipe[aws::ec2_hints]
 
   - name: ebs_volume
     run_list:

diff --git a/test/fixtures/cookbooks/aws_test/recipes/instance_monitoring.rb b/test/fixtures/cookbooks/aws_test/recipes/instance_monitoring.rb
@@ -1,18 +1,5 @@
 include_recipe 'aws'
-
-directory '/etc/chef/ohai/hints' do
-  recursive true
-  action :create
-end.run_action(:create)
-
-file '/etc/chef/ohai/hints/ec2.json' do
-  content {}
-  action :create
-end.run_action(:create)
-
-ohai 'reload' do
-  action :reload
-end.run_action(:reload)
+include_recipe 'aws::ec2_hints'
 
 aws_instance_monitoring 'enable detailed monitoring' do
   aws_access_key node['aws_test']['key_id']

diff --git a/test/fixtures/cookbooks/aws_test/recipes/resource_tag.rb b/test/fixtures/cookbooks/aws_test/recipes/resource_tag.rb
@@ -1,18 +1,5 @@
 include_recipe 'aws'
-
-directory '/etc/chef/ohai/hints' do
-  recursive true
-  action :create
-end.run_action(:create)
-
-file '/etc/chef/ohai/hints/ec2.json' do
-  content {}
-  action :create
-end.run_action(:create)
-
-ohai 'reload' do
-  action :reload
-end.run_action(:reload)
+include_recipe 'aws::ec2_hints'
 
 aws_resource_tag node['ec2']['instance_id'] do
   aws_access_key node['aws_test']['key_id']