github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92705 from pohly/nested-directories-podlogs

Browse Source 
e2e pod logs: use hierarchical directory structure
This commit is contained in:
Kubernetes Prow Robot 2020-07-02 04:17:48 -07:00 committed by GitHub
commit f023f5832b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/storage/testsuites/base.go
View File

@ -578,14 +578,24 @@ func StartPodLogs(f *framework.Framework, driverNamespace *v1.Namespace) func()
to.LogWriter = ginkgo.GinkgoWriter to.LogWriter = ginkgo.GinkgoWriter
} else { } else {
test := ginkgo.CurrentGinkgoTestDescription() test := ginkgo.CurrentGinkgoTestDescription()
// Clean up each individual component text such that
// it contains only characters that are valid as file
// name.
reg := regexp.MustCompile("[^a-zA-Z0-9_-]+") reg := regexp.MustCompile("[^a-zA-Z0-9_-]+")
var components []string
for _, component := range test.ComponentTexts {
components = append(components, reg.ReplaceAllString(component, "_"))
}
// We end the prefix with a slash to ensure that all logs // We end the prefix with a slash to ensure that all logs
// end up in a directory named after the current test. // end up in a directory named after the current test.
// //
// TODO: use a deeper directory hierarchy once gubernator // Each component name maps to a directory. This
// supports that (https://github.com/kubernetes/test-infra/issues/10289). // avoids cluttering the root artifact directory and
// keeps each directory name smaller (the full test
// name at one point exceeded 256 characters, which was
// too much for some filesystems).
to.LogPathPrefix = framework.TestContext.ReportDir + "/" + to.LogPathPrefix = framework.TestContext.ReportDir + "/" +
reg.ReplaceAllString(test.FullTestText, "_") + "/" strings.Join(components, "/") + "/"
} }
podlogs.CopyAllLogs(ctx, cs, ns, to) podlogs.CopyAllLogs(ctx, cs, ns, to)