You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:49:41 UTC

[37/50] brooklyn-server git commit: Set loginUser to ubuntu explicitly for 12.04 AMI

Set loginUser to ubuntu explicitly for 12.04 AMI


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ab22dec0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ab22dec0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ab22dec0

Branch: refs/heads/0.6.0
Commit: ab22dec05922c48f9f28ebd1cba19b9080fb10c5
Parents: e74a202
Author: Andrew Kennedy <an...@cloudsoftcorp.com>
Authored: Thu Nov 14 15:20:48 2013 +0000
Committer: Andrew Kennedy <an...@cloudsoftcorp.com>
Committed: Thu Nov 14 15:20:48 2013 +0000

----------------------------------------------------------------------
 .../base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ab22dec0/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 8bd3061..d515491 100644
--- a/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java
+++ b/software/base/src/test/java/brooklyn/entity/AbstractEc2LiveTest.java
@@ -71,7 +71,7 @@ public abstract class AbstractEc2LiveTest extends BrooklynMgmtContextTestSupport
     @Test(groups = {"Live"})
     public void test_Ubuntu_12_0() throws Exception {
         // 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));
+        runTest(ImmutableMap.of("imageId", "us-east-1/ami-d0f89fb9", "loginUser", "ubuntu", "hardwareId", SMALL_HARDWARE_ID));
     }
 
     @Test(groups = {"Live"})