ci: Fix flaky docker rotate e2e test (#4353)

Azure · Apr 5, 2021 · 7ae3df7 · 7ae3df7
1 parent 47c439d
commit 7ae3df7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go
@@ -2435,6 +2435,10 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 				Skip("No windows agent was provisioned for this Cluster Definition")
 			}
 
+			if !eng.ExpandedDefinition.Properties.OrchestratorProfile.KubernetesConfig.RequiresDocker() {
+				Skip("Skip docker validations on non-docker-backed clusters")
+			}
+
 			windowsImages, err := eng.GetWindowsTestImages()
 			loggingPodFile, err := pod.ReplaceContainerImageFromFile(filepath.Join(WorkloadDir, "validate-windows-logging.yaml"), windowsImages.ServerCore)
 			Expect(err).NotTo(HaveOccurred())

diff --git a/test/e2e/kubernetes/pod/pod.go b/test/e2e/kubernetes/pod/pod.go
@@ -1816,7 +1816,7 @@ func (p *Pod) ValidateLogsRotate(sleep, timeout time.Duration) (bool, error) {
 				return
 			default:
 				// extract the date
-				output, err := p.checkTailOfLogFor("20", "-oP '(?<=DATE=)[^.-]*'")
+				output, err := p.checkTailOfLogFor("40", "-oP '(?<=DATE=)[^.-]*'")
 				if err != nil {
 					log.Printf("Unable to tail the log:\n %s \n", output)
 					time.Sleep(sleep)