From b416496698884e3547d8fcd1b85d2d9ed4d2f3d5 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 2 Aug 2012 17:05:58 -0700 Subject: [PATCH] disabled greenqloud compute tests until baseline stuff works --- labs/greenqloud-compute/pom.xml | 3 ++- ...a => GreenQloudComputeComputeServiceLiveTestDisabled.java} | 4 ++-- ... => GreenQloudComputeTemplateBuilderLiveTestDisabled.java} | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) rename labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/{GreenQloudComputeComputeServiceLiveTest.java => GreenQloudComputeComputeServiceLiveTestDisabled.java} (87%) rename labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/{GreenQloudComputeTemplateBuilderLiveTest.java => GreenQloudComputeTemplateBuilderLiveTestDisabled.java} (95%) diff --git a/labs/greenqloud-compute/pom.xml b/labs/greenqloud-compute/pom.xml index 698f58ef82..4c7ad33b44 100644 --- a/labs/greenqloud-compute/pom.xml +++ b/labs/greenqloud-compute/pom.xml @@ -40,7 +40,7 @@ ${test.greenqloud.identity} ${test.greenqloud.credential} - osFamily=UBUNTU,osVersionMatches=1[012].[01][04],os64Bit=true + imageId=is-1/qmi-9ac92558 org.jclouds.greenqloud.compute*;version="${project.version}" @@ -116,6 +116,7 @@ ${test.greenqloud-compute.identity} ${test.greenqloud-compute.credential} ${test.greenqloud-compute.template} + ${test.greenqloud-compute.ebs-template} diff --git a/labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTest.java b/labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTestDisabled.java similarity index 87% rename from labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTest.java rename to labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTestDisabled.java index fc332ec937..5f1ed49854 100644 --- a/labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTest.java +++ b/labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeComputeServiceLiveTestDisabled.java @@ -26,9 +26,9 @@ import org.testng.annotations.Test; * @author Adrian Cole */ @Test(groups = "live", singleThreaded = true, testName = "GreenQloudComputeComputeServiceLiveTest") -public class GreenQloudComputeComputeServiceLiveTest extends EC2ComputeServiceLiveTest { +public class GreenQloudComputeComputeServiceLiveTestDisabled extends EC2ComputeServiceLiveTest { - public GreenQloudComputeComputeServiceLiveTest() { + public GreenQloudComputeComputeServiceLiveTestDisabled() { provider = "greenqloud-compute"; } } diff --git a/labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTest.java b/labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTestDisabled.java similarity index 95% rename from labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTest.java rename to labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTestDisabled.java index d233f05c43..b28290f494 100644 --- a/labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTest.java +++ b/labs/greenqloud-compute/src/test/java/org/jclouds/greenqloud/compute/GreenQloudComputeTemplateBuilderLiveTestDisabled.java @@ -41,9 +41,9 @@ import com.google.common.collect.ImmutableSet; * @author Adrian Cole */ @Test(groups = "live", testName = "GreenQloudComputeTemplateBuilderLiveTest") -public class GreenQloudComputeTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTest { +public class GreenQloudComputeTemplateBuilderLiveTestDisabled extends BaseTemplateBuilderLiveTest { - public GreenQloudComputeTemplateBuilderLiveTest() { + public GreenQloudComputeTemplateBuilderLiveTestDisabled() { provider = "greenqloud-compute"; }