Skip to content

Commit 9c6be5f

Browse files
richlanderjkotas
richlander
and
jkotas
authored
Add Alpine Edge and Azure Linux bare VM testing (#115590)
* Add Alpine edge test leg * Update Arm64 legs * Update bad yaml * Update x64 VMs to Azure Linux * Update OS version for Alpine Edge * Simplify API usage * Update src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs Co-authored-by: Jan Kotas <[email protected]> * Revert Azure Linux VM for musl x64 * Revert Azure Linux for outerloop tests * Revert AL3 VM for CoreCLR musl legs * Change musl VMs back to Azure Linux --------- Co-authored-by: Jan Kotas <[email protected]>
1 parent a78f02b commit 9c6be5f

File tree

3 files changed

+23
-15
lines changed

3 files changed

+23
-15
lines changed

‎eng/pipelines/coreclr/templates/helix-queues-setup.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
# Browser wasm
5252
- ${{ if eq(parameters.platform, 'browser_wasm') }}:
53-
- (Ubuntu.2204.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
53+
- (Ubuntu.2204.Amd64)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-webassembly
5454

5555
# iOS devices
5656
- ${{ if in(parameters.platform, 'ios_arm64') }}:
@@ -77,9 +77,9 @@ jobs:
7777
# Linux musl x64
7878
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
7979
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
80-
- (Alpine.321.Amd64.Open)azurelinux[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
80+
- (Alpine.321.Amd64.Open)AzureLinux[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
8181
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
82-
- (Alpine.321.Amd64)azurelinux[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
82+
- (Alpine.321.Amd64)AzureLinux[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
8383

8484
# Linux musl arm32
8585
- ${{ if eq(parameters.platform, 'linux_musl_arm') }}:

‎eng/pipelines/libraries/helix-queues-setup.yml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,22 @@ jobs:
3030

3131
# Linux arm64
3232
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
33-
- (Ubuntu.2504.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-25.04-helix-arm64v8
33+
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
34+
- (Ubuntu.2504.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-25.04-helix-arm64v8
3435
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
35-
- (Debian.13.Arm64.Open)Ubuntu.2204.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-arm64v8
36+
- (AzureLinux.3.0.ArmArch.Open)Ubuntu.2204.ArmArch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
3637

3738
# Linux musl x64
3839
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
39-
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
40-
- (Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
4140
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
41+
- (Alpine.edge.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-edge-helix-amd64
42+
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
4243
- (Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64
4344

4445
# Linux musl arm64
45-
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
46-
- (Alpine.321.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-arm64v8
46+
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
47+
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
48+
- (Alpine.321.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-arm64v8
4749

4850
# Linux x64
4951
- ${{ if eq(parameters.platform, 'linux_x64') }}:
@@ -54,16 +56,16 @@ jobs:
5456
- (Ubuntu.2504.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-25.04-helix-amd64
5557
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
5658
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
57-
- (Fedora.42.Amd64.Open)ubuntu.2204.amd64[email protected]/dotnet-buildtools/prereqs:fedora-42-helix-amd64
58-
- (openSUSE.15.6.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:opensuse-15.6-helix-amd64
59+
- (Fedora.42.Amd64.Open)AzureLinux.3.Amd64[email protected]/dotnet-buildtools/prereqs:fedora-42-helix-amd64
60+
- (openSUSE.15.6.Amd64.Open)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:opensuse-15.6-helix-amd64
5961
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
6062
# inner loop default
6163
- Ubuntu.2204.Amd64.Open
62-
- (AzureLinux.3.0.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64
63-
- (Centos.10.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:centos-stream-10-helix-amd64
64+
- (AzureLinux.3.0.Amd64.Open)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64
65+
- (Centos.10.Amd64.Open)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:centos-stream-10-helix-amd64
6466
- ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}:
6567
# Limiting interp runs as we don't need as much coverage.
66-
- (Debian.13.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-13-helix-amd64
68+
- (Debian.13.Amd64.Open)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:debian-13-helix-amd64
6769

6870
# OSX arm64
6971
- ${{ if eq(parameters.platform, 'osx_arm64') }}:

‎src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,13 @@ private static DistroInfo GetDistroInfo()
249249
}
250250
else if (line.StartsWith("VERSION_ID=", StringComparison.Ordinal))
251251
{
252-
result.VersionId = ToVersion(line.Substring(11).Trim('"', '\''));
252+
string versionId = line.Substring(11).Trim('"', '\'');
253+
int dashIndex = versionId.IndexOf('_'); // Strip prerelease info if any (needed for Alpine Edge)
254+
if (dashIndex != -1)
255+
{
256+
versionId = versionId.Substring(0, dashIndex);
257+
}
258+
result.VersionId = ToVersion(versionId);
253259
}
254260
}
255261
}

0 commit comments

Comments
 (0)