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.

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

E2e tests: Fix EL version detection logic in E2E tests #590

Merged
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions e2e_tests/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,25 @@ func InstallOSConfigEL7() string {
return fmt.Sprintf(yumRepoSetup+yumInstallAgent, "el7", config.AgentRepo(), 0)
}

// containsAnyOf checks if a string contains any substring from a given list.
func containsAnyOf(str string, substrings []string) bool {
for _, substring := range substrings {
if strings.Contains(str, substring) {
return true
}
}
return false
}

// InstallOSConfigEL installs the osconfig agent on el based systems.
func InstallOSConfigEL(image string) string {
imageName := path.Base(image)
switch {
case strings.Contains(path.Base(image), "9"):
case containsAnyOf(imageName, []string{"rhel-9", "rhel-sap-9", "centos-stream-9", "rocky-linux-9"}):
return InstallOSConfigEL9()
case strings.Contains(path.Base(image), "8"):
case containsAnyOf(imageName, []string{"rhel-8", "rhel-sap-8", "centos-stream-8", "rocky-linux-8"}):
return InstallOSConfigEL8()
case strings.Contains(path.Base(image), "7"):
case containsAnyOf(imageName, []string{"rhel-7", "rhel-sap-7", "centos-7"}):
return InstallOSConfigEL7()

}
Expand Down