Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated centos versions

This commit is contained in:
Adrian Cole 2011-09-22 00:42:43 -07:00
parent 4cd94489c9
commit d4323d1ffd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateBuilderLiveTest.java
View File

@ -69,7 +69,7 @@ public class AWSEC2TemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest {
case DEBIAN: case DEBIAN:
return true; return true;
case CENTOS: case CENTOS:
return input.version.matches("5.[42]") || input.version.equals(""); return input.version.matches("5.[246]") || input.version.equals("");
case WINDOWS: case WINDOWS:
return input.version.matches("200[38]") || input.version.equals(""); return input.version.matches("200[38]") || input.version.equals("");
default: default:

2
providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java
View File

@ -56,7 +56,7 @@ public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLi
case DEBIAN: case DEBIAN:
return input.is64Bit; return input.is64Bit;
case CENTOS: 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: case WINDOWS:
return input.version.equals("2008 SP2") || input.version.equals("") return input.version.equals("2008 SP2") || input.version.equals("")
|| (input.version.equals("2008 R2") && input.is64Bit); || (input.version.equals("2008 R2") && input.is64Bit);

2
providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java
View File

@ -56,7 +56,7 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi
case DEBIAN: case DEBIAN:
return input.is64Bit; return input.is64Bit;
case CENTOS: 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: case WINDOWS:
return input.version.equals("2008 SP2") || input.version.equals("") return input.version.equals("2008 SP2") || input.version.equals("")
|| (input.version.equals("2008 R2") && input.is64Bit); || (input.version.equals("2008 R2") && input.is64Bit);

2
providers/slicehost/src/test/java/org/jclouds/slicehost/compute/SlicehostTemplateBuilderLiveTest.java
View File

@ -61,7 +61,7 @@ public class SlicehostTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
return input.version.equals("") && input.is64Bit; return input.version.equals("") && input.is64Bit;
case CENTOS: case CENTOS:
return input.version.equals("") || input.version.matches("5.[45]") 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: case WINDOWS:
return input.version.equals("") || (input.version.equals("2008 SP2") && !input.is64Bit) return input.version.equals("") || (input.version.equals("2008 SP2") && !input.is64Bit)
|| input.version.equals("") || (input.version.equals("2008 R2") && input.is64Bit); || input.version.equals("") || (input.version.equals("2008 R2") && input.is64Bit);