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

Jump to bottom

Remove rhel-8-1-sap-ha #1544

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Remove rhel-8-1-sap-ha #1544

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions integration_test/agents/agents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,11 +596,11 @@ func isRetriableInstallError(platform string, err error) bool {
strings.Contains(err.Error(), "context deadline exceeded") {
return true // See b/197127877 for history.
}
if platform == "rhel-8-1-sap-ha" &&
if strings.HasPrefix(platform, "rhel-8-") && strings.HasSuffix(platform, "-sap-ha") &&
strings.Contains(err.Error(), "Could not refresh the google-cloud-ops-agent yum repositories") {
return true // See b/174039270 for history.
}
if platform == "rhel-8-1-sap-ha" &&
if strings.HasPrefix(platform, "rhel-8-") && strings.HasSuffix(platform, "-sap-ha") &&
strings.Contains(err.Error(), "Failed to download metadata for repo 'rhui-rhel-8-") {
return true // This happens when the RHEL servers are down. See b/189950957.
}
Expand Down Expand Up @@ -638,7 +638,7 @@ func RunInstallFuncWithRetry(ctx context.Context, logger *log.Logger, vm *gce.VM
shouldRetry := func(err error) bool { return isRetriableInstallError(vm.Platform, err) }
installWithRecovery := func() error {
err := installFunc()
if err != nil && shouldRetry(err) && vm.Platform == "rhel-8-1-sap-ha" {
if err != nil && shouldRetry(err) && strings.HasPrefix(vm.Platform, "rhel-8-") && strings.HasSuffix(vm.Platform, "-sap-ha") {
logger.Println("attempting recovery steps from https://access.redhat.com/discussions/4656371 so that subsequent attempts are more likely to succeed... see b/189950957")
gce.RunRemotely(ctx, logger, vm, "", "sudo dnf clean all && sudo rm -r /var/cache/dnf && sudo dnf upgrade")
}
Expand Down
2 changes: 1 addition & 1 deletion integration_test/gce/gce_testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ AGENT_PACKAGES_IN_GCS, for details see README.md.

PROJECT=dev_project \
ZONES=us-central1-b \
PLATFORMS=debian-10,centos-8,rhel-8-1-sap-ha,sles-15,ubuntu-2004-lts,windows-2016,windows-2019 \
PLATFORMS=debian-10,centos-8,rhel-8-2-sap-ha,sles-15,ubuntu-2004-lts,windows-2016,windows-2019 \
go test -v ops_agent_test.go \
-test.parallel=1000 \
-tags=integration_test \
Expand Down
1 change: 0 additions & 1 deletion kokoro/config/test/image_lists.gcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ centos8_x86_64 = _distro {
release = [
// RHEL.
'rhel-8',
'rhel-8-1-sap-ha',
'rhel-8-2-sap-ha',
'rhel-8-4-sap-ha',
'rhel-8-6-sap-ha',
Expand Down
Loading