Skip to content

Commit aa20b8f

Browse files
richlanderrichlander
authored
Revert "Switch to Azure Linux Arm64 Helix VM hosts (#117790)"
This reverts commit 5630010.
1 parent aadccee commit aa20b8f

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,37 +63,37 @@ jobs:
6363
# Linux arm
6464
- ${{ if eq(parameters.platform, 'linux_arm') }}:
6565
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
66-
- (Debian.13.Arm32.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
66+
- (Debian.13.Arm32.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
6767
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
68-
- (Debian.13.Arm32)AzureLinux.3.Arm64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
68+
- (Debian.13.Arm32)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
6969

7070
# Linux arm64
7171
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
7272
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
73-
- AzureLinux.3.Arm64.Open
73+
- (AzureLinux.3.0.ArmArch.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
7474
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
75-
- AzureLinux.3.Arm64
75+
- (AzureLinux.3.0.ArmArch)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
7676

7777
# Linux musl x64
7878
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
7979
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
80-
- (Alpine.322.Amd64.Open)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
80+
- (Alpine.322.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
8181
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
82-
- (Alpine.322.Amd64)AzureLinux.3[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
82+
- (Alpine.322.Amd64)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
8383

8484
# Linux musl arm32
8585
- ${{ if eq(parameters.platform, 'linux_musl_arm') }}:
8686
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
87-
- (Alpine.322.Arm32.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
87+
- (Alpine.322.Arm32.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
8888
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
89-
- (Alpine.322.Arm32)AzureLinux.3.Arm64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
89+
- (Alpine.322.Arm32)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-arm32v7
9090

9191
# Linux musl arm64
9292
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
9393
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
94-
- (Alpine.322.Arm64.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
94+
- (Alpine.322.Arm64.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
9595
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
96-
- (Alpine.322.Arm64)AzureLinux.3.Arm64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
96+
- (Alpine.322.Arm64)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
9797

9898
# Linux x64
9999
- ${{ if eq(parameters.platform, 'linux_x64') }}:

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,24 @@ jobs:
2525

2626
# Linux arm
2727
- ${{ if eq(parameters.platform, 'linux_arm') }}:
28-
- (Debian.13.Arm32.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
28+
- (Debian.13.Arm32.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
2929

3030
# Linux arm64
3131
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
32-
- (Ubuntu.2510.Arm64.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:ubuntu-25.10-helix-arm64v8
32+
- (Ubuntu.2510.Arm64.Open)Ubuntu.2204.Armarch[email protected]/dotnet-buildtools/prereqs:ubuntu-25.10-helix-arm64v8
3333

3434
# Linux musl x64
3535
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
3636
- (Alpine.322.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
3737

3838
# Linux musl arm64
3939
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
40-
- (Alpine.322.Arm64.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
40+
- (Alpine.322.Arm64.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
4141

4242
# Linux x64
4343
- ${{ if eq(parameters.platform, 'linux_x64') }}:
4444
- AzureLinux.3.Amd64.Open
45+
- Ubuntu.2204.Amd64.Open
4546

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,26 @@ jobs:
2626
# Linux arm
2727
- ${{ if eq(parameters.platform, 'linux_arm') }}:
2828
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
29-
- (Debian.13.Arm32.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
29+
- (Debian.13.Arm32.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
3030

3131
# Linux arm64
3232
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
3333
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
34-
- (Ubuntu.2510.ArmArch.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:ubuntu-25.10-helix-arm64v8
34+
- (Ubuntu.2510.ArmArch.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:ubuntu-25.10-helix-arm64v8
3535
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
36-
- (AzureLinux.3.0.ArmArch.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
36+
- (AzureLinux.3.0.ArmArch.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-arm64v8
3737

3838
# Linux musl x64
3939
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
4040
- ${{ 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
41+
- (Alpine.edge.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-edge-helix-amd64
4242
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
4343
- (Alpine.322.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64
4444

4545
# Linux musl arm64
4646
- ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
4747
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
48-
- (Alpine.322.Arm64.Open)AzureLinux.3.Arm64[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
48+
- (Alpine.322.Arm64.Open)Ubuntu.2204.ArmArch[email protected]/dotnet-buildtools/prereqs:alpine-3.22-helix-arm64v8
4949

5050
# Linux x64
5151
- ${{ if eq(parameters.platform, 'linux_x64') }}:

0 commit comments

Comments
 (0)