From 9b3c0370e98fbf9b1daadbdedaa2191398bb1089 Mon Sep 17 00:00:00 2001 From: t-qini Date: Mon, 22 Jul 2019 07:26:11 +0000 Subject: [PATCH 1/2] increase some timeout configs --- tests/e2e/utils/service_utils.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/utils/service_utils.go b/tests/e2e/utils/service_utils.go index 87f4aec402..7ef9dd1a67 100644 --- a/tests/e2e/utils/service_utils.go +++ b/tests/e2e/utils/service_utils.go @@ -29,7 +29,7 @@ import ( ) const ( - serviceTimeout = 20 * time.Minute + serviceTimeout = 30 * time.Minute ) // DeleteService deletes a service @@ -99,7 +99,7 @@ func WaitUpdateServiceExposure(cs clientset.Interface, namespace string, name st var service *v1.Service var err error poll := 10 * time.Second - timeout := 10 * time.Minute + timeout := 30 * time.Minute return wait.PollImmediate(poll, timeout, func() (bool, error) { service, err = cs.CoreV1().Services(namespace).Get(name, metav1.GetOptions{}) From 9ba5640b3668d68f37d917f1791f7510fe3a8076 Mon Sep 17 00:00:00 2001 From: t-qini Date: Mon, 22 Jul 2019 07:53:32 +0000 Subject: [PATCH 2/2] add config manifest for serial e2e test --- .../k8s-azure/manifest/linux-vmss-serial.json | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 tests/k8s-azure/manifest/linux-vmss-serial.json diff --git a/tests/k8s-azure/manifest/linux-vmss-serial.json b/tests/k8s-azure/manifest/linux-vmss-serial.json new file mode 100644 index 0000000000..905147977e --- /dev/null +++ b/tests/k8s-azure/manifest/linux-vmss-serial.json @@ -0,0 +1,53 @@ +{ + "apiVersion": "vlabs", + "location": "", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes", + "orchestratorRelease": "1.15", + "kubernetesConfig": { + "useCloudControllerManager": true, + "customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.15.0", + "customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.15.0", + "networkPolicy": "none", + "cloudProviderRateLimitQPS": 6, + "cloudProviderRateLimitBucket": 20, + "controllerManagerConfig": { + "--feature-gates": "CSIInlineVolume=true,LocalStorageCapacityIsolation=true,ServiceNodeExclusion=true" + }, + "apiServerConfig": { + "--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages" + } + } + }, + "masterProfile": { + "count": 1, + "dnsPrefix": "{dnsPrefix}", + "vmSize": "Standard_F2" + }, + "agentPoolProfiles": [ + { + "name": "agentpool1", + "count": 2, + "vmSize": "Standard_F2", + "availabilityProfile": "VirtualMachineScaleSets", + "storageProfile": "ManagedDisks", + "enableVMSSNodePublicIP": true + } + ], + "linuxProfile": { + "adminUsername": "k8s-ci", + "ssh": { + "publicKeys": [ + { + "keyData": "{keyData}" + } + ] + } + }, + "servicePrincipalProfile": { + "clientID": "{servicePrincipalClientID}", + "secret": "{servicePrincipalClientSecret}" + } + } +} \ No newline at end of file