Updated Ubuntu 12.04 AMI id for aws-ec2:us-east-1 to prevent hanging
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8b7ba883 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8b7ba883 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8b7ba883 Branch: refs/heads/0.6.0 Commit: 8b7ba8838e5888264fb9e9ac8992cbe75b174ac7 Parents: a22f5cb Author: Andrew Kennedy <[email protected]> Authored: Thu Nov 14 13:07:27 2013 +0000 Committer: Andrew Kennedy <[email protected]> Committed: Thu Nov 14 13:07:27 2013 +0000 ---------------------------------------------------------------------- .../base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8b7ba883/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java index ac9e800..8bd3061 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java @@ -70,8 +70,8 @@ public abstract class AbstractEc2LiveTest extends BrooklynMgmtContextTestSupport @Test(groups = {"Live"}) public void test_Ubuntu_12_0() throws Exception { - // Image: {id=us-east-1/ami-0769ee6e, providerId=ami-0769ee6e, name=RightImage_Ubuntu_12.04_x64_v5.8.8.5, location={scope=REGION, id=us-east-1, description=us-east-1, parent=aws-ec2, iso3166Codes=[US-VA]}, os={family=ubuntu, arch=paravirtual, version=12.04, description=rightscale-us-east/RightImage_Ubuntu_12.04_x64_v5.8.8.5.manifest.xml, is64Bit=true}, description=rightscale-us-east/RightImage_Ubuntu_12.04_x64_v5.8.8.5.manifest.xml, version=5.8.8.5, status=AVAILABLE[available], loginUser=root, userMetadata={owner=411009282317, rootDeviceType=instance-store, virtualizationType=paravirtual, hypervisor=xen}} - runTest(ImmutableMap.of("imageId", "us-east-1/ami-0769ee6e", "hardwareId", SMALL_HARDWARE_ID)); + // Image: {id=us-east-1/ami-d0f89fb9, providerId=ami-d0f89fb9, name=ubuntu/images/ebs/ubuntu-precise-12.04-amd64-server-20130411.1, location={scope=REGION, id=us-east-1, description=us-east-1, parent=aws-ec2, iso3166Codes=[US-VA]}, os={family=ubuntu, arch=paravirtual, version=12.04, description=099720109477/ubuntu/images/ebs/ubuntu-precise-12.04-amd64-server-20130411.1, is64Bit=true}, description=099720109477/ubuntu/images/ebs/ubuntu-precise-12.04-amd64-server-20130411.1, version=20130411.1, status=AVAILABLE[available], loginUser=ubuntu, userMetadata={owner=099720109477, rootDeviceType=ebs, virtualizationType=paravirtual, hypervisor=xen}} + runTest(ImmutableMap.of("imageId", "us-east-1/ami-d0f89fb9", "hardwareId", SMALL_HARDWARE_ID)); } @Test(groups = {"Live"})
