poise-boiler 1.13.2 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f7b1b4134b3b7492607f45b1b07b8a81b6d95f2
-  data.tar.gz: efbf4127eb413f709425a4b72dd6a1745a632872
+  metadata.gz: f57300a29b2e9a7c8bc9fcc44a4776f72de99830
+  data.tar.gz: 9247d44758c5307eb3371c9862f217219db3b680
 SHA512:
-  metadata.gz: 31c3ca03fbeec4e6c24319fd6f4299d122c1f6982b75159717954adf84b3b2c1af0576e88393fe4f3edfdcbed4ad0ce6c253374099c5f9514452e0906f4f68e7
-  data.tar.gz: 70cc8958b9d30c26ca599df855728cd7324bbbcab3f77fd5850ecfac29f0a749f7819776290644dd176579ef7d8c603ce196d76d7d9c32dcdf89e4ec0107f652
+  metadata.gz: 1c20b4be76e93d84bc27a9122920c9bc57302201d33dfcd6383b4bf0784c5ab2f9fbb41b96572272bf0acfde5f19eb2c0a6eef86d1e73e459c545016384197e0
+  data.tar.gz: 8737d162302255f2ac401d3360ee5dd7d7724752974a11fd2ab71a974958adb09c2cdb235b0e8f82e6ee57777606c6c9d1d7c1b4dc545775735565466a5c98ac

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Poise-Boiler Changelog
 
+## 1.14.0
+
+* Improvements to EC2 and Windows testing with Kitchen. EC2 data handling is now
+  mostly standardized with some reasonable defaults.
+
 ## 1.13.2
 
 * Re-allow older WinRM gems for ChefDK testing.

data/gemfiles/master.gemfile

@@ -18,3 +18,4 @@ eval_gemfile File.expand_path('../../Gemfile', __FILE__)
 
 gem 'chef', github: 'chef/chef'
 gem 'halite', github: 'poise/halite'
+gem 'ohai', github: 'chef/ohai'

data/lib/poise_boiler/helpers/kitchen.rb

@@ -29,6 +29,7 @@ module PoiseBoiler
       # @see #expand_platforms
       PLATFORM_ALIASES = {
         'windows' => %w{windows-2012r2},
+        'windows32' => %w{windows-2008sp2},
         'ubuntu' => %w{ubuntu-12.04 ubuntu-14.04},
         'rhel' => %w{centos},
         'centos' => %w{centos-6 centos-7},
@@ -37,6 +38,15 @@ module PoiseBoiler
         'all' => %w{unix windows},
       }
 
+      # Default EC2 subnet ID when not overridden in the environment or config.
+      DEFAULT_EC2_SUBNET_ID = 'subnet-ca674af7'
+
+      # Default EC2 subnet ID for previous-generation instance types.
+      DEFAULT_EC2_LEGACY_INSTANCES_SUBNET_ID = 'subnet-1ffec232'
+
+      # Default EC2 security group when not overridden in the environment or config.
+      DEFAULT_EC2_SECURITY_GROUP_ID = 'sg-ed1ad892'
+
       def initialize(**options)
         # Figure out the directory that contains the kitchen.yml by looking for
         # the first entry in the stack that isn't inside poise-boiler.
@@ -155,9 +165,7 @@ module PoiseBoiler
           # Set a default instance size.
           config['flavor_id'] = options[:rackspace_flavor] || 'general1-1'
         when 'ec2'
-          # Allow passing some values as environment variables.
-          config['security_group_ids'] = [ENV['AWS_SECURITY_GROUP_ID']]
-          config['subnet_id'] = ENV['AWS_SUBNET_ID']
+          config.update(ec2_driver_config)
         end
         config
       end
@@ -169,8 +177,15 @@ module PoiseBoiler
         {
           # Use the sftp transport from kitchen-sync.
           'name' => 'sftp',
-          # Use the generated SSH key from kitchen-docker if present.
-          'ssh_key' => kitchen_driver == 'docker' ? File.expand_path('.kitchen/docker_id_rsa', base) : nil,
+          # Use the SSH key for this driver.
+          'ssh_key' => case kitchen_driver
+                       when 'docker'
+                         "#{base}/.kitchen/docker_id_rsa"
+                       when 'ec2'
+                         "#{base}/test/ec2/ssh.key"
+                       else
+                         nil
+                       end,
         }
       end
 
@@ -209,16 +224,27 @@ module PoiseBoiler
       # Generate extra Test Kitchen platform configuration for Windows hosts.
       def windows_platform_config(name)
         {
-          'driver' => {
-            'name' => 'ec2',
+          'driver' => ec2_driver_config.merge({
             'instance_type' => 'm3.medium',
-            'aws_ssh_key_id' => 'ec2',
+            'retryable_tries' => 120,
+          }),
+          'provisioner' => {
+            'product_name' => 'chef',
+            'channel' =>  chef_version ? 'stable' : 'current',
+            'product_version' => chef_version,
           },
           'transport' => {
             'name' => 'winrm',
-            'ssh_key' => File.expand_path('~/.ssh/ec2.pem'),
+            'ssh_key' => "#{base}/test/ec2/ssh.key",
           },
-        }
+        }.tap do |cfg|
+          if name == 'windows-2008sp2'
+            cfg['driver']['image_id'] = 'ami-f6a043e0'
+            cfg['driver']['instance_type'] = 'm1.medium'
+            cfg['driver']['subnet_id'] = ENV['AWS_SUBNET_ID'] || DEFAULT_EC2_LEGACY_INSTANCES_SUBNET_ID
+            cfg['provisioner']['architecture'] = 'i386'
+          end
+        end
       end
 
       # Generate a Test Kitchen suite configuration hash. This is a single suite
@@ -232,6 +258,19 @@ module PoiseBoiler
         }
       end
 
+      # Generate a Test Kitchen driver configuration hash with basic settings
+      # for kitchen-ec2.
+      #
+      # @return [Hash]
+      def ec2_driver_config
+        {
+          'name' => 'ec2',
+          'aws_ssh_key_id' => "#{cookbook_name}-kitchen",
+          'security_group_ids' => ENV['AWS_SECURITY_GROUP_ID'] ? [ENV['AWS_SECURITY_GROUP_ID']] : [DEFAULT_EC2_SECURITY_GROUP_ID],
+          'subnet_id' => ENV['AWS_SUBNET_ID'] || DEFAULT_EC2_SUBNET_ID,
+        }
+      end
+
     end
   end
 end

data/lib/poise_boiler/helpers/rake/travis.rb

@@ -56,8 +56,30 @@ module PoiseBoiler
             sh(*cmd)
           end
 
+          task 'travis:integration:rackspace' do
+            if integration_rackspace?
+              shell.say('Configuring Rackspace test dependencies')
+              task('.ssh/id_rsa').invoke
+            end
+          end
+
+          task 'travis:integration:docker' do
+            if integration_docker?
+              shell.say('Configuring Docker test dependencies')
+              task('test/docker/docker.key').invoke
+              task('./docker').invoke
+            end
+          end
+
+          task 'travis:integration:ec2' do
+            if ENV['KITCHEN_EC2_PASS']
+              shell.say('Configuring EC2 test dependencies')
+              sh(*%w{openssl rsa -in test/ec2/ssh.pem -passin env:KITCHEN_EC2_PASS -out test/ec2/ssh.key})
+            end
+          end
+
           desc 'Run Test-Kitchen integration tests.'
-          task 'travis:integration' => ( ( integration_rackspace? ? %w{.ssh/id_rsa} : integration_docker? ? %w{test/docker/docker.key ./docker} : [] ) + %w{chef:kitchen} )
+          task 'travis:integration' => %w{travis:integration:rackspace travis:integration:docker travis:integration:ec2 chef:kitchen}
 
           desc 'Run CI tests'
           task 'travis' do

data/lib/poise_boiler/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseBoiler
-  VERSION = '1.13.2'
+  VERSION = '1.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-boiler
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.14.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler