Merge pull request sous-chefs#133 from hw-cookbooks/feature/test-kitchen-refresh

Freshen testing

Author: Darrin Eden

.gitignore

@@ -12,3 +12,4 @@ Gemfile.lock
 .kitchen
 bin
 .kitchen.local.yml
+.kitchen/

.kitchen.yml

@@ -1,39 +1,22 @@
 ---
 driver_plugin: vagrant
-driver_config:
-  require_chef_omnibus: true
 
 platforms:
 - name: ubuntu-12.04
-  driver_config:
-    box: opscode-ubuntu-12.04
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
   run_list:
   - recipe[apt]
 
 - name: ubuntu-10.04
-  driver_config:
-    box: opscode-ubuntu-10.04
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_provisionerless.box
   run_list:
   - recipe[apt]
 
-- name: debian-7.1.0
-  driver_config:
-    box: opscode-debian-7.1.0
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_debian-7.1.0_provisionerless.box
+- name: debian-7.4
   run_list:
   - recipe[apt]
 
 - name: centos-6.4
-  driver_config:
-    box: opscode-centos-6.4
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
 
-- name: centos-5.9
-  driver_config:
-    box: opscode-centos-5.9
-    box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_centos-5.9_provisionerless.box
+- name: centos-5.10
 
 suites:
 - name: default
@@ -54,7 +37,7 @@ suites:
   run_list:
   - recipe[minitest-handler]
   - recipe[postgresql]
-  excludes: ["centos-5.9", "centos-6.4"]
+  excludes: ["centos-5.10", "centos-6.4"]
   attributes:
     postgresql:
       enable_pgdg_apt: true
@@ -64,7 +47,7 @@ suites:
   run_list:
   - recipe[minitest-handler]
   - recipe[postgresql]
-  excludes: ["ubuntu-10.04", "ubuntu-12.04", "debian-7.1.0"]
+  excludes: ["ubuntu-10.04", "ubuntu-12.04", "debian-7.4"]
   attributes:
     postgresql:
       enable_pgdg_yum: true
@@ -93,7 +76,7 @@ suites:
   - recipe[minitest-handler]
   - recipe[postgresql::ruby]
   - recipe[postgresql::server]
-  excludes: ["centos-5.9", "centos-6.4"]
+  excludes: ["centos-5.10", "centos-6.4"]
   attributes:
     postgresql:
       enable_pgdg_apt: true
@@ -109,7 +92,7 @@ suites:
   - recipe[minitest-handler]
   - recipe[postgresql::ruby]
   - recipe[postgresql::server]
-  excludes: ["ubuntu-10.04", "ubuntu-12.04", "debian-7.1.0"]
+  excludes: ["ubuntu-10.04", "ubuntu-12.04", "debian-7.4"]
   attributes:
     postgresql:
       enable_pgdg_yum: true
@@ -125,7 +108,7 @@ suites:
   - recipe[minitest-handler]
   - recipe[postgresql]
   - recipe[postgresql::ruby]
-  excludes: ["centos-5.9", "centos-6.4"]
+  excludes: ["centos-5.10", "centos-6.4"]
   attributes:
     postgresql:
       enable_pgdg_apt: true
@@ -136,7 +119,7 @@ suites:
   - recipe[minitest-handler]
   - recipe[postgresql]
   - recipe[postgresql::ruby]
-  excludes: ["ubuntu-10.04", "ubuntu-12.04", "debian-7.1.0"]
+  excludes: ["ubuntu-10.04", "ubuntu-12.04", "debian-7.4"]
   attributes:
     postgresql:
       enable_pgdg_yum: true

Berksfile

@@ -3,5 +3,6 @@ site :opscode
 metadata
 
 group :integration do
+  cookbook 'build-essential', github: 'opscode-cookbooks/build-essential'
   cookbook 'minitest-handler'
 end

Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'test-kitchen'
+gem 'kitchen-vagrant'
+gem 'berkshelf'

attributes/default.rb

@@ -171,10 +171,11 @@
   default['postgresql']['config']['datestyle'] = 'iso, mdy'
   default['postgresql']['config']['default_text_search_config'] = 'pg_catalog.english'
   default['postgresql']['config']['ssl'] = true
-  default['postgresql']['config']['ssl_cert_file'] = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-  default['postgresql']['config']['ssl_key_file'] = '/etc/ssl/private/ssl-cert-snakeoil.key'
+  default['postgresql']['config']['ssl_cert_file'] = '/etc/ssl/certs/ssl-cert-snakeoil.pem' if node['postgresql']['version'].to_f >= 9.2
+  default['postgresql']['config']['ssl_key_file'] = '/etc/ssl/private/ssl-cert-snakeoil.key'if node['postgresql']['version'].to_f >= 9.2
 when 'rhel', 'fedora', 'suse'
   default['postgresql']['config']['listen_addresses'] = 'localhost'
+  default['postgresql']['config']['port'] = 5432
   default['postgresql']['config']['max_connections'] = 100
   default['postgresql']['config']['shared_buffers'] = '32MB'
   default['postgresql']['config']['logging_collector'] = true

recipes/client.rb

@@ -19,8 +19,8 @@
 # limitations under the License.
 #
 
-if node['postgresql']['version'].to_f > 9.1 && platform_family?('ubuntu', 'debian')
-  node.default['postgresql']['enable_pgdg_apt'] = true
+if platform_family?('ubuntu', 'debian') && node['postgresql']['version'].to_f > 9.1
+    node.default['postgresql']['enable_pgdg_apt'] = true
 end
 
 if(node['postgresql']['enable_pgdg_apt'])

recipes/ruby.rb

@@ -25,7 +25,14 @@
   require 'pg'
 rescue LoadError
 
-  node.set['build_essential']['compiletime'] = true
+  if platform_family?('ubuntu', 'debian')
+    e = execute 'apt-get update' do
+      action :nothing
+    end
+    e.run_action(:run) unless ::File.exists?('/var/lib/apt/periodic/update-success-stamp')
+  end
+
+  node.set['build-essential']['compile_time'] = true
   include_recipe "build-essential"
   include_recipe "postgresql::client"
 
@@ -47,9 +54,9 @@
     resources("package[#{pg_pack}]").run_action(:install)
   end
 
-  if ["debian","ubuntu"].include? node['platform']  
+  if ["debian","ubuntu"].include? node['platform']
     package "libpq-dev" do
-        action :nothing
+      action :nothing
     end.run_action(:install)
   end