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

Internal: add opensuse-leap to suse special handling in tests #1716

Merged
merged 1 commit into from
May 21, 2024
Merged

Internal: add opensuse-leap to suse special handling in tests #1716

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: 2 additions & 2 deletions integration_test/gce/gce_testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@ func attemptCreateInstance(ctx context.Context, logger *log.Logger, options VMOp
vm.OS = *os
}

if vm.OS.ID == "opensuse" || vm.OS.ID == "sles" || vm.OS.ID == "sles_sap" {
if vm.OS.ID == "opensuse" || vm.OS.ID == "opensuse-leap" || vm.OS.ID == "sles" || vm.OS.ID == "sles_sap" {
// Set download.max_silent_tries to 5 (by default, it is commented out in
// the config file). This should help with issues like b/211003972.
if _, err := RunRemotely(ctx, logger, vm, "sudo sed -i -E 's/.*download.max_silent_tries.*/download.max_silent_tries = 5/g' /etc/zypp/zypp.conf"); err != nil {
Expand Down Expand Up @@ -1550,7 +1550,7 @@ func InstallGsutilIfNeeded(ctx context.Context, logger *log.Logger, vm *VM) erro

// SUSE seems to be the only distro without gsutil, so what follows is all
// very SUSE-specific.
if vm.OS.ID != "opensuse" && vm.OS.ID != "sles" && vm.OS.ID != "sles_sap" {
if vm.OS.ID != "opensuse" && vm.OS.ID != "opensuse-leap" && vm.OS.ID != "sles" && vm.OS.ID != "sles_sap" {
return installErr("gsutil", vm.OS.ID)
}

Expand Down
Loading