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

Internal: fix install gsutil issues on suse distros #1703

Merged
merged 4 commits into from
May 21, 2024

Conversation

Subbarker
Copy link
Contributor

@Subbarker Subbarker commented May 13, 2024

Description

Related issue

b/337015263

How has this been tested?

Checklist:

  • Unit tests
    • Unit tests do not apply.
    • Unit tests have been added/modified and passed for this PR.
  • Integration tests
    • Integration tests do not apply.
    • Integration tests have been added/modified and passed for this PR.
  • Documentation
    • This PR introduces no user visible changes.
    • This PR introduces user visible changes and the corresponding documentation change has been made.
  • Minor version bump
    • This PR introduces no new features.
    • This PR introduces new features, and there is a separate PR to bump the minor version since the last release already.
    • This PR bumps the version.

@Subbarker Subbarker changed the title Internal: fix sles gsutil issues Internal: fix sles install gsutil issues May 13, 2024
@Subbarker Subbarker changed the title Internal: fix sles install gsutil issues Internal: fix install gsutil issues on suse distros May 13, 2024
@Subbarker Subbarker added the kokoro:force-run Forces kokoro to run integration tests on a CL label May 14, 2024
@stackdriver-instrumentation-release stackdriver-instrumentation-release removed the kokoro:force-run Forces kokoro to run integration tests on a CL label May 14, 2024
@Subbarker Subbarker merged commit a906394 into master May 21, 2024
75 checks passed
@Subbarker Subbarker deleted the subbarker-suse-gsutil branch May 21, 2024 15:44
@@ -1550,8 +1550,8 @@ 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 !IsSUSE(vm.ImageSpec) {
return installErr("gsutil", vm.ImageSpec)
if vm.OS.ID != "opensuse" && vm.OS.ID != "sles" && vm.OS.ID != "sles_sap" {
Copy link
Member

Choose a reason for hiding this comment

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

Why are we not changing IsSUSE to use vm.OS.ID and then calling that?

Copy link
Contributor

Choose a reason for hiding this comment

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

This was the approach we ended up using in #1720 .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants