From b7c1f4a2b53a85d9edfad82c67a0b94de6c1459a Mon Sep 17 00:00:00 2001
From: Teemu Matilainen <teemu.matilainen@iki.fi>
Date: Thu, 2 May 2013 22:53:31 -0300
Subject: [PATCH 1/2] Upgrade CentOS integration test AMI to 5.8

Use another RightScale AMI.
---
 test/integration/{centos5_6_test.rb => centos5_8_test.rb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename test/integration/{centos5_6_test.rb => centos5_8_test.rb} (72%)

diff --git a/test/integration/centos5_6_test.rb b/test/integration/centos5_8_test.rb
similarity index 72%
rename from test/integration/centos5_6_test.rb
rename to test/integration/centos5_8_test.rb
index 7a6f6400..088f4b76 100644
--- a/test/integration/centos5_6_test.rb
+++ b/test/integration/centos5_8_test.rb
@@ -1,12 +1,12 @@
 require 'integration_helper'
 
-class Centos5_6Test < IntegrationTest
+class Centos5_8Test < IntegrationTest
   def user
     "root"
   end
 
   def image_id
-    "ami-3fe42456"
+    "ami-100e8a79"
   end
 
   include EmptyCook

From deb622d86455e84e155267870ccba923cf74e8ed Mon Sep 17 00:00:00 2001
From: Teemu Matilainen <teemu.matilainen@iki.fi>
Date: Thu, 2 May 2013 23:29:13 -0300
Subject: [PATCH 2/2] Add integration test for CentOS 6.3

Use official CentOS 6 AMI:
  http://wiki.centos.org/Cloud/AWS

The image has iptables firewall enabled that only allow SSH connections
in and thus makes the Apache cookbook test to fail. So we just shut down
the whole firewall.
---
 Manifest.txt                       |  3 ++-
 test/integration/centos6_3_test.rb | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 test/integration/centos6_3_test.rb

diff --git a/Manifest.txt b/Manifest.txt
index b9835bea..1ea7c4d1 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -39,7 +39,8 @@ test/integration/cases/cache_path_usage.rb
 test/integration/cases/empty_cook.rb
 test/integration/cases/encrypted_data_bag.rb
 test/integration/cases/knife_bootstrap.rb
-test/integration/centos5_6_test.rb
+test/integration/centos5_8_test.rb
+test/integration/centos6_3_test.rb
 test/integration/debian6_bootstrap_test.rb
 test/integration/debian7_knife_bootstrap_test.rb
 test/integration/gentoo2011_test.rb
diff --git a/test/integration/centos6_3_test.rb b/test/integration/centos6_3_test.rb
new file mode 100644
index 00000000..a60bdacb
--- /dev/null
+++ b/test/integration/centos6_3_test.rb
@@ -0,0 +1,24 @@
+require 'integration_helper'
+
+class Centos6_3Test < IntegrationTest
+  def user
+    "root"
+  end
+
+  def image_id
+    "ami-86e15bef"
+  end
+
+  def prepare_server
+    disable_firewall
+    super
+  end
+
+  def disable_firewall
+    system "ssh #{connection_string} service iptables stop >> #{log_file}"
+  end
+
+  include EmptyCook
+  include Apache2Cook
+  include EncryptedDataBag
+end