Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

ci: Fix flaky docker rotate e2e test #4353

Merged
merged 2 commits into from
Apr 5, 2021
Merged

ci: Fix flaky docker rotate e2e test #4353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41ae94b
ci: only validate against docker clusters
jsturtevant Apr 5, 2021
7241ba1
ci: increase number of logs read
jsturtevant Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions test/e2e/kubernetes/kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CRI log rotate went stable in v1.21
kubernetes/enhancements#2411

Should we create an issue to investigate added a test for that with aks-engine?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created #4354

}

windowsImages, err := eng.GetWindowsTestImages()
loggingPodFile, err := pod.ReplaceContainerImageFromFile(filepath.Join(WorkloadDir, "validate-windows-logging.yaml"), windowsImages.ServerCore)
Expect(err).NotTo(HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/kubernetes/pod/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down