Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachtest: fix zipping of artifacts to include other zips #84085

Merged
merged 1 commit into from
Jul 8, 2022
Merged

roachtest: fix zipping of artifacts to include other zips #84085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion pkg/cmd/roachtest/test_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1439,7 +1439,9 @@ func zipArtifacts(path string) error {
if err != nil {
return err
}
if !info.IsDir() && strings.HasSuffix(path, ".zip") {
dir, _ := filepath.Split(rel(path))
isTopLevel := dir == ""
if !info.IsDir() && isTopLevel && strings.HasSuffix(path, ".zip") {
// Skip any top-level zip files, which notably includes itself
// and, if present, the debug.zip.
return nil
Expand Down