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

added debian 6 to bluesquare

This commit is contained in:
Adrian Cole 2011-06-02 19:57:55 -07:00
parent fc2c59d861
commit 9ef411d39a
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
providers/elastichosts-lon-b/src/main/resources/elastichosts-lon-b/preinstalled_images.json
View File

@ -13,6 +13,13 @@
"osVersion": "5.0", "osVersion": "5.0",
"size": "1" "size": "1"
}, },
{
"uuid": "6aa953cc-3395-4e8d-938e-65c74fd20334",
"description": "Debian Linux 6.0.1",
"osFamily": "DEBIAN",
"osVersion": "6.0",
"size": "1"
},
{ {
"uuid": "aee5589a-88c3-43ef-bb0a-9cab6e64192d", "uuid": "aee5589a-88c3-43ef-bb0a-9cab6e64192d",
"description": "Ubuntu Linux 10.04", "description": "Ubuntu Linux 10.04",

2
providers/elastichosts-lon-b/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsBlueSquareLondonComputeServiceLiveTest.java
View File

@ -25,7 +25,7 @@ import org.testng.annotations.Test;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Test(groups = "live", sequential = true, testName = "ElasticHostsBlueSquareLondonComputeServiceLiveTest") @Test(groups = "live", singleThreaded = true, testName = "ElasticHostsBlueSquareLondonComputeServiceLiveTest")
public class ElasticHostsBlueSquareLondonComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest { public class ElasticHostsBlueSquareLondonComputeServiceLiveTest extends ElasticStackComputeServiceLiveTest {
public ElasticHostsBlueSquareLondonComputeServiceLiveTest() { public ElasticHostsBlueSquareLondonComputeServiceLiveTest() {

2
providers/elastichosts-lon-b/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsBlueSquareLondonTemplateBuilderLiveTest.java
View File

@ -54,7 +54,7 @@ public class ElasticHostsBlueSquareLondonTemplateBuilderLiveTest extends BaseTem
case UBUNTU: case UBUNTU:
return (input.version.equals("") || input.version.equals("10.04")) && input.is64Bit; return (input.version.equals("") || input.version.equals("10.04")) && input.is64Bit;
case DEBIAN: case DEBIAN:
return (input.version.equals("") || input.version.equals("5.0")) && input.is64Bit; return (input.version.equals("") || input.version.matches("[56].0")) && input.is64Bit;
case CENTOS: case CENTOS:
return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit; return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit;
case WINDOWS: case WINDOWS: