From d4323d1ffd5d63275daa5bdabb29a7a877964bbb Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 22 Sep 2011 00:42:43 -0700 Subject: [PATCH] updated centos versions --- .../jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java | 2 +- .../compute/CloudServersUKTemplateBuilderLiveTest.java | 2 +- .../compute/CloudServersUSTemplateBuilderLiveTest.java | 2 +- .../slicehost/compute/SlicehostTemplateBuilderLiveTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java index 95085efd5a..86d3ac3a73 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java @@ -69,7 +69,7 @@ public class AWSEC2TemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { case DEBIAN: return true; case CENTOS: - return input.version.matches("5.[42]") || input.version.equals(""); + return input.version.matches("5.[246]") || input.version.equals(""); case WINDOWS: return input.version.matches("200[38]") || input.version.equals(""); default: diff --git a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java index e0fb46d202..efa7c04ab2 100644 --- a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java +++ b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java @@ -56,7 +56,7 @@ public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLi case DEBIAN: return input.is64Bit; case CENTOS: - return (input.version.equals("") || input.version.matches("5.[45]")) && input.is64Bit; + return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit; case WINDOWS: return input.version.equals("2008 SP2") || input.version.equals("") || (input.version.equals("2008 R2") && input.is64Bit); diff --git a/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java b/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java index 930f0cbe5c..37e23c53c2 100644 --- a/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java +++ b/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java @@ -56,7 +56,7 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi case DEBIAN: return input.is64Bit; case CENTOS: - return !(input.version.matches("5.[023]")) && input.is64Bit; + return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit; case WINDOWS: return input.version.equals("2008 SP2") || input.version.equals("") || (input.version.equals("2008 R2") && input.is64Bit); diff --git a/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java index 9ae09d62e6..8a42e6c3ea 100644 --- a/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java +++ b/providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java @@ -61,7 +61,7 @@ public class SlicehostTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes return input.version.equals("") && input.is64Bit; case CENTOS: return input.version.equals("") || input.version.matches("5.[45]") - || (input.version.equals("5.0") && input.is64Bit); + || (input.version.matches("5.[06]") && input.is64Bit); case WINDOWS: return input.version.equals("") || (input.version.equals("2008 SP2") && !input.is64Bit) || input.version.equals("") || (input.version.equals("2008 R2") && input.is64Bit);