You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/04/06 23:00:28 UTC
[2/3] jclouds-labs git commit: [JCLOUDS-849] Explicitly setting
default test image location to West Europe
[JCLOUDS-849] Explicitly setting default test image location to West Europe
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/ab6993fb
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/ab6993fb
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/ab6993fb
Branch: refs/heads/master
Commit: ab6993fbd89c80f0947fd3ec1df58f4626feccac
Parents: d3ff98a
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Mar 30 12:01:49 2015 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Mon Apr 6 22:48:51 2015 +0200
----------------------------------------------------------------------
.../jclouds/azurecompute/AzureComputeProviderMetadataLive.java | 4 +++-
.../azurecompute/internal/BaseAzureComputeApiLiveTest.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ab6993fb/azurecompute/src/test/java/org/jclouds/azurecompute/AzureComputeProviderMetadataLive.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/AzureComputeProviderMetadataLive.java b/azurecompute/src/test/java/org/jclouds/azurecompute/AzureComputeProviderMetadataLive.java
index 86bda72..2786c63 100644
--- a/azurecompute/src/test/java/org/jclouds/azurecompute/AzureComputeProviderMetadataLive.java
+++ b/azurecompute/src/test/java/org/jclouds/azurecompute/AzureComputeProviderMetadataLive.java
@@ -25,6 +25,7 @@ import com.google.auto.service.AutoService;
import java.net.URI;
import java.util.Properties;
import org.jclouds.azurecompute.config.AzureComputeProperties;
+import org.jclouds.azurecompute.internal.BaseAzureComputeApiLiveTest;
import org.jclouds.providers.ProviderMetadata;
@AutoService(ProviderMetadata.class)
@@ -41,7 +42,8 @@ public class AzureComputeProviderMetadataLive extends AzureComputeProviderMetada
public static Properties defaultProperties() {
Properties properties = AzureManagementApiMetadata.defaultProperties();
- properties.setProperty(TEMPLATE, "osFamily=UBUNTU,osVersionMatches=.*14\\.10.*,loginUser=jclouds");
+ properties.setProperty(TEMPLATE, "osFamily=UBUNTU,osVersionMatches=.*14\\.10.*,loginUser=jclouds,"
+ + "locationId=" + BaseAzureComputeApiLiveTest.LOCATION);
properties.setProperty(OPERATION_TIMEOUT, "" + 600 * 1000);
properties.setProperty(OPERATION_POLL_INITIAL_PERIOD, "" + 5);
properties.setProperty(OPERATION_POLL_MAX_PERIOD, "" + 15);
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/ab6993fb/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java
index 3d57bd9..5ad992f 100644
--- a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java
+++ b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiLiveTest.java
@@ -57,7 +57,7 @@ public class BaseAzureComputeApiLiveTest extends AbstractAzureComputeApiLiveTest
public static final String DEFAULT_SUBNET_NAME = "jclouds-1";
- public static final String LOCATION = "South Central US";
+ public static final String LOCATION = "West Europe";
public static final String IMAGE_NAME =
"b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04_1-LTS-amd64-server-20150123-en-us-30GB";