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

View File

@ -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:

View File

@ -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);

View File

@ -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);

View File

@ -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);