use westus2 for swarm tests (Azure#3956)

idanlevin · Oct 4, 2018 · 962c5a0 · 962c5a0
1 parent 6dd1876
commit 962c5a0
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 22 deletions.
diff --git a/examples/disks-managed/swarm-preAttachedDisks-vmss.json b/examples/disks-managed/swarm-preAttachedDisks-vmss.json
@@ -12,15 +12,15 @@
     "agentPoolProfiles": [
       {
         "name": "agentpool1",
-        "count": 3,
+        "count": 1,
         "vmSize": "Standard_D2_v2",
         "availabilityProfile": "VirtualMachineScaleSets",
         "storageProfile": "ManagedDisks",
         "diskSizesGB": [128, 128, 128, 128]
       },
       {
           "name": "agentpublic",
-          "count": 3,
+          "count": 1,
           "dnsPrefix": "",
           "vmSize": "Standard_D2_v2",
           "availabilityProfile": "VirtualMachineScaleSets",

diff --git a/examples/disks-managed/swarmmode-vmas.json b/examples/disks-managed/swarmmode-vmas.json
@@ -12,15 +12,15 @@
     "agentPoolProfiles": [
       {
         "name": "agentpool1",
-        "count": 3,
+        "count": 1,
         "vmSize": "Standard_D2_v2",
         "OSDiskSizeGB": 200,
         "availabilityProfile": "AvailabilitySet",
         "storageProfile": "ManagedDisks"
       },
       {
           "name": "agentpublic",
-          "count": 3,
+          "count": 1,
           "vmSize": "Standard_D2_v2",
           "OSDiskSizeGB": 200,
           "availabilityProfile": "AvailabilitySet",

diff --git a/examples/disks-managed/swarmmode-vmss.json b/examples/disks-managed/swarmmode-vmss.json
@@ -12,14 +12,14 @@
     "agentPoolProfiles": [
       {
         "name": "agentpool1",
-        "count": 3,
+        "count": 1,
         "vmSize": "Standard_D2_v2",
         "availabilityProfile": "VirtualMachineScaleSets",
         "storageProfile": "ManagedDisks"
       },
       {
           "name": "agentpublic",
-          "count": 3,
+          "count": 1,
           "vmSize": "Standard_D2_v2",
           "availabilityProfile": "VirtualMachineScaleSets",
           "storageProfile": "ManagedDisks",

diff --git a/examples/disks-storageaccount/swarmmode.json b/examples/disks-storageaccount/swarmmode.json
@@ -5,15 +5,15 @@
       "orchestratorType": "SwarmMode"
     },
     "masterProfile": {
-      "count": 3,
+      "count": 1,
       "dnsPrefix": "",
       "vmSize": "Standard_D2_v2",
       "OSDiskSizeGB": 200
     },
     "agentPoolProfiles": [
       {
         "name": "agent128",
-        "count": 3,
+        "count": 1,
         "vmSize": "Standard_D2_v2",
         "OSDiskSizeGB": 200,
         "availabilityProfile": "AvailabilitySet",
@@ -22,7 +22,7 @@
       },
       {
         "name": "agentpublic",
-        "count": 3,
+        "count": 1,
         "vmSize": "Standard_D2_v2",
         "dnsPrefix": "",
         "availabilityProfile": "AvailabilitySet",

diff --git a/examples/swarm.json b/examples/swarm.json
@@ -12,7 +12,7 @@
     "agentPoolProfiles": [
       {
         "name": "agentpublic",
-        "count": 3,
+        "count": 1,
         "vmSize": "Standard_D2_v2",
         "dnsPrefix": "",
         "ports": [

diff --git a/examples/v20170131/swarmmode.json b/examples/v20170131/swarmmode.json
@@ -5,14 +5,14 @@
       "orchestratorType": "SwarmMode"
     },
     "masterProfile": {
-      "count": 3,
+      "count": 1,
       "dnsPrefix": "",
       "vmSize": "Standard_D2_v2"
     },
     "agentPoolProfiles": [
       {
         "name": "agentpublic",
-        "count": 3,
+        "count": 1,
         "vmSize": "Standard_D2_v2",
         "dnsPrefix": "",
         "ports": [

diff --git a/examples/vnet/swarmmodevnet.json b/examples/vnet/swarmmodevnet.json
@@ -5,7 +5,7 @@
       "orchestratorType": "SwarmMode"
     },
     "masterProfile": {
-      "count": 3,
+      "count": 1,
       "dnsPrefix": "",
       "vmSize": "Standard_D2_v2",
       "vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/MASTER_SUBNET_NAME",
@@ -14,13 +14,13 @@
     "agentPoolProfiles": [
       {
         "name": "agentprivate",
-        "count": 3,
+        "count": 1,
         "vmSize": "Standard_D2_v2",
         "vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/AGENT_SUBNET_NAME"
       },
       {
         "name": "agentpublic",
-        "count": 3,
+        "count": 1,
         "vmSize": "Standard_D2_v2",
         "dnsPrefix": "",
         "vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/AGENT_SUBNET_NAME",

diff --git a/test/e2e/swarm-deployments.json b/test/e2e/swarm-deployments.json
@@ -1,10 +1,12 @@
 {
 	"deployments": [
 		{
-			"cluster_definition": "swarm.json"
+			"cluster_definition": "swarm.json",
+			"location": "westus2"
 		},
 		{
-			"cluster_definition": "disks-managed/swarm-preAttachedDisks-vmss.json"
+			"cluster_definition": "disks-managed/swarm-preAttachedDisks-vmss.json",
+			"location": "westus2"
 		}
 	]
 }
diff --git a/test/e2e/swarmmode-deployments.json b/test/e2e/swarmmode-deployments.json
@@ -1,19 +1,24 @@
 {
 	"deployments": [
 		{
-			"cluster_definition": "disks-managed/swarmmode-vmas.json"
+			"cluster_definition": "disks-managed/swarmmode-vmas.json",
+			"location": "westus2"
 		},
 		{
-			"cluster_definition": "disks-managed/swarmmode-vmss.json"
+			"cluster_definition": "disks-managed/swarmmode-vmss.json",
+			"location": "westus2"
 		},
 		{
-			"cluster_definition": "disks-storageaccount/swarmmode.json"
+			"cluster_definition": "disks-storageaccount/swarmmode.json",
+			"location": "westus2"
 		},
 		{
-			"cluster_definition": "v20170131/swarmmode.json"
+			"cluster_definition": "v20170131/swarmmode.json",
+			"location": "westus2"
 		},
 		{
-			"cluster_definition": "vnet/swarmmodevnet.json"
+			"cluster_definition": "vnet/swarmmodevnet.json",
+			"location": "westus2"
 		}
 	]
 }