E2E: cleanup legacy kubernetes (Azure#2275)

* add e2e hybrid definition also remove tiller explicit config from windows api model * removing windows + hybrid from legacy e2e * removing tests from legacy e2e that are elsewhere * add rescheduler, remove more from legacy e2e * add debug for service URL content mismatch
tesharp · Mar 15, 2018 · 933f0c7 · 933f0c7
1 parent 8aa7f9d
commit 933f0c7
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 65 deletions.
diff --git a/examples/e2e-tests/kubernetes/release/default/definition.json b/examples/e2e-tests/kubernetes/release/default/definition.json
@@ -12,6 +12,10 @@
             "config": {
               "max-history": "5"
             }
+          },
+          {
+            "name": "rescheduler",
+            "enabled" : true
           }
         ]
       }
@@ -32,7 +36,7 @@
         "vmSize": "Standard_D2_v2",
         "OSDiskSizeGB": 200,
         "storageProfile" : "ManagedDisks",
-        "diskSizesGB": [128],
+        "diskSizesGB": [128, 128, 128, 128],
         "availabilityProfile": "AvailabilitySet",
         "vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME"
       },

diff --git a/examples/e2e-tests/kubernetes/windows/definition.json b/examples/e2e-tests/kubernetes/windows/definition.json
@@ -2,18 +2,7 @@
   "apiVersion": "vlabs",
   "properties": {
     "orchestratorProfile": {
-      "orchestratorType": "Kubernetes",
-      "kubernetesConfig": {
-        "addons": [
-          {
-            "name": "tiller",
-            "enabled" : true,
-            "config": {
-              "max-history": "5"
-            }
-          }
-        ]
-      }
+      "orchestratorType": "Kubernetes"
     },
     "masterProfile": {
       "count": 3,

diff --git a/examples/e2e-tests/kubernetes/windows/hybrid/definition.json b/examples/e2e-tests/kubernetes/windows/hybrid/definition.json
@@ -0,0 +1,46 @@
+{
+  "apiVersion": "vlabs",
+  "properties": {
+    "orchestratorProfile": {
+      "orchestratorType": "Kubernetes"
+    },
+    "masterProfile": {
+      "count": 3,
+      "dnsPrefix": "",
+      "vmSize": "Standard_D2_v2"
+    },
+    "agentPoolProfiles": [
+      {
+        "name": "linuxpool1",
+        "count": 3,
+        "vmSize": "Standard_D2_v2",
+        "availabilityProfile": "AvailabilitySet"
+      },
+      {
+        "name": "agentwin",
+        "count": 2,
+        "vmSize": "Standard_D2_v2",
+        "availabilityProfile": "AvailabilitySet",
+        "osType": "Windows"
+      }
+    ],
+    "windowsProfile": {
+      "adminUsername": "azureuser",
+      "adminPassword": "replacepassword1234$"
+    },
+    "linuxProfile": {
+      "adminUsername": "azureuser",
+      "ssh": {
+        "publicKeys": [
+          {
+            "keyData": ""
+          }
+        ]
+      }
+    },
+    "servicePrincipalProfile": {
+      "clientId": "",
+      "secret": ""
+    }
+  }
+}
diff --git a/test/acse-conf/acse-regression.json b/test/acse-conf/acse-regression.json
@@ -1,13 +1,5 @@
 {
   "deployments": [
-    {
-      "cluster_definition": "windows/kubernetes-hybrid.json",
-      "category": "windows"
-    },
-    {
-      "cluster_definition": "windows/kubernetes.json",
-      "category": "windows"
-    },
     {
       "cluster_definition": "dcos-releases/dcos1.9.json",
       "category": "version"
@@ -20,14 +12,6 @@
       "cluster_definition": "disks-managed/dcos-vmss.json",
       "category": "managed-disk"
     },
-    {
-      "cluster_definition": "disks-managed/kubernetes-preAttachedDisks-vmas.json",
-      "category": "managed-disk"
-    },
-    {
-      "cluster_definition": "disks-managed/kubernetes-vmas.json",
-      "category": "managed-disk"
-    },
     {
       "cluster_definition": "disks-managed/swarm-preAttachedDisks-vmss.json",
       "category": "managed-disk"
@@ -44,10 +28,6 @@
       "cluster_definition": "disks-storageaccount/dcos.json",
       "category": "managed-disk"
     },
-    {
-      "cluster_definition": "disks-storageaccount/kubernetes.json",
-      "category": "sa-disk"
-    },
     {
       "cluster_definition": "disks-storageaccount/swarmmode.json",
       "category": "sa-disk"
@@ -57,38 +37,10 @@
       "category": "keyvault",
       "location": "westus"
     },
-    {
-      "cluster_definition": "kubernetes-releases/kubernetes1.8.json",
-      "category": "version"
-    },
     {
       "cluster_definition": "networkpolicy/kubernetes-calico.json",
       "category": "network"
     },
-    {
-      "cluster_definition": "networkpolicy/kubernetes-azure.json",
-      "category": "network"
-    },
-    {
-      "cluster_definition": "kubernetes-config/kubernetes-clustersubnet.json",
-      "category": "network"
-    },
-    {
-      "cluster_definition": "kubernetes-config/kubernetes-no-dashboard.json",
-      "category": "config"
-    },
-    {
-      "cluster_definition": "kubernetes-config/kubernetes-rescheduler.json",
-      "category": "config"
-    },
-    {
-      "cluster_definition": "multiple-masters/kubernetes-3-masters.json",
-      "category": "multimaster"
-    },
-    {
-      "cluster_definition": "multiple-masters/kubernetes-5-masters.json",
-      "category": "multimaster"
-    },
     {
       "cluster_definition": "v20170131/swarmmode.json",
       "category": "version"
@@ -97,10 +49,6 @@
       "cluster_definition": "vnet/dcosvnet.json",
       "category": "network"
     },
-    {
-      "cluster_definition": "vnet/kubernetesvnet-azure-cni.json",
-      "category": "network"
-    },
     {
       "cluster_definition": "vnet/kubernetesvnet.json",
       "category": "network"

diff --git a/test/e2e/kubernetes/service/service.go b/test/e2e/kubernetes/service/service.go
@@ -136,6 +136,7 @@ func (s *Service) Validate(check string, attempts int, sleep time.Duration) bool
 			if matched == true {
 				return true
 			}
+			log.Printf("Got unexpected URL body, expected to find %s, got:\n%s\n", check, string(body))
 		}
 		time.Sleep(sleep)
 	}