From 93363fd94c8f33b38429ed6b00731989870bcd8a Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Thu, 11 Oct 2018 14:00:38 -0700 Subject: [PATCH 1/4] set stability iterations to 10 by default --- test/e2e/kubernetes/kubernetes_test.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go index 5024c01c9f..a535680fbf 100644 --- a/test/e2e/kubernetes/kubernetes_test.go +++ b/test/e2e/kubernetes/kubernetes_test.go @@ -70,11 +70,9 @@ var _ = BeforeSuite(func() { masterSSHPort = "22" } masterSSHPrivateKeyFilepath = cfg.GetSSHKeyPath() - // TODO - // If no user-configurable stability iteration value is passed in, run stability tests once - /*if cfg.StabilityIterations == 0 { - cfg.StabilityIterations = 1 - }*/ + if cfg.StabilityIterations == 0 { + cfg.StabilityIterations = 10 + } }) var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", func() { From 71ee7b1f0ed0f25533793c1285eecd21c06d6277 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Thu, 11 Oct 2018 16:13:38 -0700 Subject: [PATCH 2/4] rename stability tests and undo flaky Windows test --- test/e2e/kubernetes/kubernetes_test.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go index a535680fbf..c02c7de39c 100644 --- a/test/e2e/kubernetes/kubernetes_test.go +++ b/test/e2e/kubernetes/kubernetes_test.go @@ -406,7 +406,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu } }) - It("should have stable external container networking", func() { + It("should have stable external container networking as we recycle a bunch of pods", func() { name := fmt.Sprintf("alpine-%s", cfg.Name) command := fmt.Sprintf("nc -vz 8.8.8.8 53 || nc -vz 8.8.4.4 53") successes, err := pod.RunCommandMultipleTimes(pod.RunLinuxPod, "alpine", name, command, cfg.StabilityIterations) @@ -414,7 +414,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu Expect(successes).To(Equal(cfg.StabilityIterations)) }) - It("should have stable internal container networking", func() { + It("should have stable internal container networking as we recycle a bunch of pods", func() { name := fmt.Sprintf("alpine-%s", cfg.Name) var command string if common.IsKubernetesVersionGe(eng.ExpandedDefinition.Properties.OrchestratorProfile.OrchestratorVersion, "1.12.0") { @@ -544,7 +544,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu Expect(err).NotTo(HaveOccurred()) Expect(ready).To(Equal(true)) - By("Ensuring that we have stable external DNS resolution from a container") + By("Ensuring that we have stable external DNS resolution as we recycle a bunch of pods") name := fmt.Sprintf("alpine-%s", cfg.Name) command := fmt.Sprintf("nc -vz bbc.co.uk 80 || nc -vz google.com 443 || nc -vz microsoft.com 80") successes, err := pod.RunCommandMultipleTimes(pod.RunLinuxPod, "alpine", name, command, cfg.StabilityIterations) @@ -1144,17 +1144,18 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu windowsService, err := service.Get(windowsDeploymentName, "default") Expect(err).NotTo(HaveOccurred()) - By("Connecting to Windows from another Windows deployment") + // TODO stabilize this test + /*By("Connecting to Windows from another Windows deployment") name := fmt.Sprintf("windows-2-windows-%s", cfg.Name) command := fmt.Sprintf("iwr -UseBasicParsing -TimeoutSec 60 %s", windowsService.Metadata.Name) successes, err := pod.RunCommandMultipleTimes(pod.RunWindowsPod, windowsServerImage, name, command, cfg.StabilityIterations) Expect(err).NotTo(HaveOccurred()) - Expect(successes).To(Equal(cfg.StabilityIterations)) + Expect(successes).To(Equal(cfg.StabilityIterations))*/ By("Connecting to Linux from Windows deployment") - name = fmt.Sprintf("windows-2-linux-%s", cfg.Name) - command = fmt.Sprintf("iwr -UseBasicParsing -TimeoutSec 60 %s", linuxService.Metadata.Name) - successes, err = pod.RunCommandMultipleTimes(pod.RunWindowsPod, windowsServerImage, name, command, cfg.StabilityIterations) + name := fmt.Sprintf("windows-2-linux-%s", cfg.Name) + command := fmt.Sprintf("iwr -UseBasicParsing -TimeoutSec 60 %s", linuxService.Metadata.Name) + successes, err := pod.RunCommandMultipleTimes(pod.RunWindowsPod, windowsServerImage, name, command, cfg.StabilityIterations) Expect(err).NotTo(HaveOccurred()) Expect(successes).To(Equal(cfg.StabilityIterations)) From fe12f5878fe5145ec85c210ab46a27764c3a7925 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Fri, 12 Oct 2018 09:14:19 -0700 Subject: [PATCH 3/4] circle bump --- test/e2e/kubernetes/kubernetes_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go index c02c7de39c..7333ce08b9 100644 --- a/test/e2e/kubernetes/kubernetes_test.go +++ b/test/e2e/kubernetes/kubernetes_test.go @@ -1150,7 +1150,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu command := fmt.Sprintf("iwr -UseBasicParsing -TimeoutSec 60 %s", windowsService.Metadata.Name) successes, err := pod.RunCommandMultipleTimes(pod.RunWindowsPod, windowsServerImage, name, command, cfg.StabilityIterations) Expect(err).NotTo(HaveOccurred()) - Expect(successes).To(Equal(cfg.StabilityIterations))*/ + Expect(successes).To(Equal(cfg.StabilityIterations)) */ By("Connecting to Linux from Windows deployment") name := fmt.Sprintf("windows-2-linux-%s", cfg.Name) From 93f30683e2db5ebe89225b0857c67617fcd6ca0a Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Fri, 12 Oct 2018 13:48:14 -0700 Subject: [PATCH 4/4] stability iterations by default only if not win --- test/e2e/kubernetes/kubernetes_test.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go index 7333ce08b9..2c98b404e9 100644 --- a/test/e2e/kubernetes/kubernetes_test.go +++ b/test/e2e/kubernetes/kubernetes_test.go @@ -70,7 +70,7 @@ var _ = BeforeSuite(func() { masterSSHPort = "22" } masterSSHPrivateKeyFilepath = cfg.GetSSHKeyPath() - if cfg.StabilityIterations == 0 { + if cfg.StabilityIterations == 0 && !eng.HasWindowsAgents() { cfg.StabilityIterations = 10 } }) @@ -1144,18 +1144,17 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu windowsService, err := service.Get(windowsDeploymentName, "default") Expect(err).NotTo(HaveOccurred()) - // TODO stabilize this test - /*By("Connecting to Windows from another Windows deployment") + By("Connecting to Windows from another Windows deployment") name := fmt.Sprintf("windows-2-windows-%s", cfg.Name) command := fmt.Sprintf("iwr -UseBasicParsing -TimeoutSec 60 %s", windowsService.Metadata.Name) successes, err := pod.RunCommandMultipleTimes(pod.RunWindowsPod, windowsServerImage, name, command, cfg.StabilityIterations) Expect(err).NotTo(HaveOccurred()) - Expect(successes).To(Equal(cfg.StabilityIterations)) */ + Expect(successes).To(Equal(cfg.StabilityIterations)) By("Connecting to Linux from Windows deployment") - name := fmt.Sprintf("windows-2-linux-%s", cfg.Name) - command := fmt.Sprintf("iwr -UseBasicParsing -TimeoutSec 60 %s", linuxService.Metadata.Name) - successes, err := pod.RunCommandMultipleTimes(pod.RunWindowsPod, windowsServerImage, name, command, cfg.StabilityIterations) + name = fmt.Sprintf("windows-2-linux-%s", cfg.Name) + command = fmt.Sprintf("iwr -UseBasicParsing -TimeoutSec 60 %s", linuxService.Metadata.Name) + successes, err = pod.RunCommandMultipleTimes(pod.RunWindowsPod, windowsServerImage, name, command, cfg.StabilityIterations) Expect(err).NotTo(HaveOccurred()) Expect(successes).To(Equal(cfg.StabilityIterations))