Skip to content

update alpine test images #82931

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

Merged
wfurt merged 3 commits into from
Mar 10, 2023
Merged

update alpine test images #82931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c85c3c2
update alpine test images
wfurt Mar 3, 2023
d34d6bb
tests
wfurt Mar 3, 2023
0aefa63
Merge branch 'main' of https://github.com/dotnet/runtime into alpine
wfurt Mar 5, 2023
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
12 changes: 6 additions & 6 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,23 @@ jobs:
# Linux musl x64
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.314.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64
- (Alpine.315.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64
Copy link
Member

@ManickaP ManickaP Mar 6, 2023

Choose a reason for hiding this comment

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

We had the "newer" Alpine here. Should we then rather use 3.17 here?
Based on https://endoflife.date/alpine 3.15 will get EOLed around the time we ship 8.0.

Copy link
Member Author

@wfurt wfurt Mar 8, 2023

Choose a reason for hiding this comment

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

I'm not sure and I did not want to jump too far. Up to 3.16 Alpine uses OpenSSL 1.1 while 3.17 switched to 3.0. It may be beneficial to run both - at least for now. ASP.NET jumped on 3.16 and we may do that later before 8.0 ships. For now, I'm proposing to run on oldest(ish) supported version.

- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.314.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-amd64
- (Alpine.315.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64

# Linux musl arm32
- ${{ if eq(parameters.platform, 'linux_musl_arm') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.314.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7
- (Alpine.315.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.15-helix-arm32v7
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.314.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm32v7
- (Alpine.315.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.15-helix-arm32v7

# Linux musl arm64
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Alpine.314.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8
- (Alpine.315.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.15-helix-arm64v8
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Alpine.314.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8
- (Alpine.315.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.15-helix-arm64v8

# Linux x64
- ${{ if eq(parameters.platform, 'linux_x64') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:

# Linux musl arm64
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
- (Alpine.313.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.13-helix-arm64v8
- (Alpine.314.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.14-helix-arm64v8
- (Alpine.317.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-arm64v8
Copy link
Member

@ManickaP ManickaP Mar 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

There's inclusion of 3.15 and 3.17 few lines above. I'm trying to decode the conditions and difference between them:

above:
linux_musl_x64 && ( ! isExtraPlatforms || includeAllPlatforms) --> 3.15
linux_musl_x64 && (   isExtraPlatforms || includeAllPlatforms) --> 3.17

here:
linux_musl_x64 && (   isExtraPlatforms || includeAllPlatforms) --> 3.15 && 3.17

Should this be somehow collapsed into one block? Are we running twice on 3.17 thanks to this?

Copy link
Member Author

@wfurt wfurt Mar 8, 2023

Choose a reason for hiding this comment

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

I probably don't understand the comment. the section above (assuming lines 50-55) are for x86 e.g. amd64. Line 59 is for arm64 e.g. arm64v8

Copy link
Member

@ManickaP ManickaP Mar 8, 2023

Choose a reason for hiding this comment

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

Fudge, arm and amd look too similar 🤣 Nevermind then.

- (Alpine.315.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.15-helix-arm64v8

# Linux x64
- ${{ if eq(parameters.platform, 'linux_x64') }}:
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ public static partial class PlatformDetection
public static bool IsUbuntu2004 => IsDistroAndVersion("ubuntu", 20, 4);
public static bool IsDebian => IsDistroAndVersion("debian");
public static bool IsAlpine => IsDistroAndVersion("alpine");
public static bool IsAlpine313 => IsDistroAndVersion("alpine", 3, 13);
public static bool IsAlpine314 => IsDistroAndVersion("alpine", 3, 14);
public static bool IsDebian10 => IsDistroAndVersion("debian", 10);
public static bool IsRaspbian10 => IsDistroAndVersion("raspbian", 10);
public static bool IsMariner => IsDistroAndVersion("mariner");
Expand Down
3 changes: 0 additions & 3 deletions src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public void SupportedWindowsPlatforms_IsSupportedIsTrue()
Assert.True(QuicConnection.IsSupported);
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/81901", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine314), nameof(PlatformDetection.IsInContainer))]
[Fact]
[PlatformSpecific(TestPlatforms.Linux)]
public async Task SupportedLinuxPlatformsWithMsQuic_IsSupportedIsTrue()
Expand All @@ -55,8 +54,6 @@ public async Task SupportedLinuxPlatformsWithMsQuic_IsSupportedIsTrue()
}
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/81901", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine313), nameof(PlatformDetection.IsInContainer))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/81901", typeof(PlatformDetection), nameof(PlatformDetection.IsAlpine314), nameof(PlatformDetection.IsInContainer))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/81901", typeof(PlatformDetection), nameof(PlatformDetection.IsMariner1), nameof(PlatformDetection.IsInContainer))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/81901", typeof(PlatformDetection), nameof(PlatformDetection.IsCentos7), nameof(PlatformDetection.IsInContainer))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/82055", typeof(PlatformDetection), nameof(PlatformDetection.IsUbuntu1804), nameof(PlatformDetection.IsArmProcess), nameof(PlatformDetection.IsInContainer))]
Expand Down