You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/11/10 14:20:43 UTC
[3/6] brooklyn-server git commit: Fix Debian 7 live test
Fix Debian 7 live test
ami-5586a43c is not unavailable.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e01a4eff
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e01a4eff
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e01a4eff
Branch: refs/heads/master
Commit: e01a4effac50ba99d3443a171bdd94e0cddf26e9
Parents: 94ab2f8
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Nov 8 19:22:26 2016 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Nov 10 10:31:42 2016 +0000
----------------------------------------------------------------------
.../apache/brooklyn/entity/AbstractEc2LiveTest.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e01a4eff/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java
index a3cb9b7..7e67ee0 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/AbstractEc2LiveTest.java
@@ -96,10 +96,20 @@ public abstract class AbstractEc2LiveTest extends BrooklynAppLiveTestSupport {
runTest(ImmutableMap.of("imageId", "us-east-1/ami-5e12dc36", "loginUser", "admin", "hardwareId", SMALL_HARDWARE_ID));
}
- @Test(groups = {"Live"})
+ /**
+ * @deprecated since 0.10.0 use {@link #test_Debian_7()} instead.
+ */
+ @Test(groups = {"Live"}, enabled=false)
+ @Deprecated
public void test_Debian_7_2() throws Exception {
- // release codename "wheezy"
- runTest(ImmutableMap.of("imageId", "us-east-1/ami-5586a43c", "loginUser", "admin", "hardwareId", SMALL_HARDWARE_ID));
+ test_Debian_7();
+ }
+
+ @Test(groups = {"Live"})
+ public void test_Debian_7() throws Exception {
+ // See images at https://wiki.debian.org/Cloud/AmazonEC2Image/Wheezy.
+ // release codename "wheezy", version 7.8.aws.1.
+ runTest(ImmutableMap.of("imageId", "us-east-1/ami-baeda9d2", "loginUser", "admin", "hardwareId", SMALL_HARDWARE_ID));
}
@Test(groups = {"Live"})