Added centos, debian to AWS kitchen + switch to ruby_rbenv and plugin rvm download to download ruby

Author: oswaldderiemaecker

.gitignore

@@ -18,3 +18,4 @@ bin/*
 
 .kitchen/
 .kitchen*.local.yml
+*.local.*

.kitchen-aws.yml

@@ -1,67 +1,51 @@
 ---
 driver:
   name: ec2
-  aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %> 
-  shared_credentials_profile: <%= ENV['AWS_PROFILE'] %>
-  security_group_ids: ["sg-0000000"]
   region: us-east-1
-  availability_zone: e
   require_chef_omnibus: true
-  subnet_id: subnet-00000000
-  iam_profile_name: CodeDeploy
-  iam_profile_name: CodeDeployGitHubDemo
   associate_public_ip: true
+  aws_ssh_key_id: key-pairs
+  security_group_ids: ["sg-000000"]
   interface: dns
 
 transport:
-  ssh_key: ~/.ssh/aws-codedeploy-agent-cookbook.pem
+  ssh_key: ~/.ssh/key-pairs.pem
   connection_timeout: 10
   connection_retries: 5
   username: ubuntu
 
 platforms:
+  - name: ubuntu-16.04-aws
+    driver:
+      image_id: ami-c45b54ae
+      instance_type: t2.micro
   - name: ubuntu-14.04-aws
     driver:
-      image_id: ami-d05e75b8 
-      instance_type: m3.medium
-      block_device_mappings:
-        - ebs_device_name: /dev/sda1
-          ebs_volume_type: gp2 
-          ebs_virtual_name: test
-          ebs_volume_size: 8 
-          ebs_delete_on_termination: true
+      image_id: ami-d05e75b8
+      instance_type: t2.micro
   - name: ubuntu-12.04-aws
     driver:
       image_id: ami-81fb34ea
-      block_device_mappings:
-        - ebs_device_name: /dev/sda1
-          ebs_volume_type: gp2
-          ebs_virtual_name: test
-          ebs_volume_size: 8
-          ebs_delete_on_termination: true
+      instance_type: t2.micro
   - name: debian-8-aws
     driver:
-      image_id: ami-8b9a63e0
-      block_device_mappings:
-        - ebs_device_name: /dev/xvda
-          ebs_volume_type: gp2
-          ebs_virtual_name: test
-          ebs_volume_size: 8
-          ebs_delete_on_termination: true
+      image_id: ami-8e9ca3e4
+      instance_type: t2.micro
     transport:
           username: admin
-  - name: amazon-linux 
+  - name: centos-7-aws
     driver:
-      image_id: ami-1ecae776 
+      image_id: ami-6d1c2007
       instance_type: t2.micro
-      block_device_mappings:
-        - ebs_device_name: /dev/sdb
-          ebs_volume_type: gp2
-          ebs_virtual_name: test
-          ebs_volume_size: 8
-          ebs_delete_on_termination: true
     transport:
-          username: ec2-user 
+          username: centos
+  - name: amazon-linux
+    driver:
+      image_id: ami-1ecae776
+      instance_type: t2.micro
+    transport:
+          username: ec2-user
+
 suites:
   - name: aws-codedeploy-agent
     run_list:

recipes/default.rb

@@ -59,13 +59,13 @@
   end
 
 when 'centos'
-  %w(unzip rsync ruby tar openssl-devel readline-devel zlib-devel bzip2).each do |pkg|
+  %w(unzip rsync ruby tar openssl-devel readline-devel zlib-devel bzip2 initscripts).each do |pkg|
     package pkg
   end
   manual_installer
   service 'codedeploy-agent' do
-    action [:start]
-    provider Chef::Provider::Service::Init
+    action [:enable,:start]
+    Chef::Provider::Service::Upstart
   end
 
 when 'debian'
@@ -77,18 +77,25 @@
     package pkg
   end
   download_installer
+  service 'codedeploy-agent' do
+    action [:enable,:start]
+  end
 
 when 'amazon'
   %w(ruby aws-cli).each do |pkg|
     package pkg
   end
   amazon_installer
+  service 'codedeploy-agent' do
+    action [:start]
+    provider Chef::Provider::Service::Init
+  end
 else
   %w(unzip rsync ruby tar openssl-devel readline-devel zlib-devel).each do |pkg|
     package pkg
   end
   manual_installer
   service 'codedeploy-agent' do
-    action [:start]
+    action [:enable,:start]
   end
 end

test/integration/aws-codedeploy-agent/serverspec/default_spec.rb

@@ -3,7 +3,7 @@
 set :backend, :exec
 
 describe service('codedeploy-agent') do
-  it { should be_running }
+  it { should be_enabled }
 end
 
 describe command('ps -ax | grep "codedeploy-agent: InstanceAgent"') do