Skip to content

No-JIRA: Fix conditional labels when in different folder structure than expected #2281

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −15
Open

No-JIRA: Fix conditional labels when in different folder structure than expected #2281

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
16 changes: 1 addition & 15 deletions openshift-hack/e2e/annotate/annotate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,28 +231,14 @@ func (r *ginkgoTestRenamer) generateRename(name string, node types.TestSpec) {
newLabels += " [Suite:openshift/conformance/parallel]"
}
}
codeLocations := node.CodeLocations()
if isGoModulePath(codeLocations[len(codeLocations)-1].FileName, "k8s.io/kubernetes", "test/e2e") {
newLabels += " [Suite:k8s]"
}
newLabels += " [Suite:k8s]"
Copy link
Member

Choose a reason for hiding this comment

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

Interesting, I use a different path as well, but I don't have this issue. Also, k8s.io/kubernetes is a module, not a path. The patch here would be test/e2e.

@smg247 is it worth spending time on this? Are we going to drop annotations soon?

Copy link
Author

Choose a reason for hiding this comment

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

Maybe it used to be part of the vendor as vendor/k8s.io/kubernetes, hence the reason why it was included?


if err := checkBalancedBrackets(newName); err != nil {
r.errors = append(r.errors, err.Error())
}
r.output[name] = newLabels
}

// isGoModulePath returns true if the packagePath reported by reflection is within a
// module and given module path. When go mod is in use, module and modulePath are not
// contiguous as they were in older golang versions with vendoring, so naive contains
// tests fail.
//
// historically: ".../vendor/k8s.io/kubernetes/test/e2e"
// go.mod: "k8s.io/[email protected]/test/e2e"
func isGoModulePath(packagePath, module, modulePath string) bool {
return regexp.MustCompile(fmt.Sprintf(`\b%s(@[^/]*|)/%s\b`, regexp.QuoteMeta(module), regexp.QuoteMeta(modulePath))).MatchString(packagePath)
}

// checkBalancedBrackets ensures that square brackets are balanced in generated test
// names. If they are not, it returns an error with the name of the test and a guess
// where the unmatched bracket(s) are.
Expand Down