Skip to content

Commit 5cd059e

Browse files
authored
Update EOL versions (#54791)
1 parent f91bd43 commit 5cd059e

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ stages:
444444
jobDisplayName: "Build: Linux Musl ARM"
445445
agentOs: Linux
446446
useHostedUbuntu: false
447-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
447+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
448448
buildArgs:
449449
--arch arm
450450
--os-name linux-musl
@@ -478,7 +478,7 @@ stages:
478478
jobDisplayName: "Build: Linux Musl ARM64"
479479
agentOs: Linux
480480
useHostedUbuntu: false
481-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm64-alpine
481+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
482482
buildArgs:
483483
--arch arm64
484484
--os-name linux-musl
@@ -607,7 +607,7 @@ stages:
607607
parameters:
608608
platform:
609609
name: 'Managed'
610-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
610+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
611611
buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
612612
skipPublishValidation: true
613613
jobProperties:

.azure/pipelines/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ extends:
138138
image: 1es-windows-2022-pt
139139
os: windows
140140
containers:
141-
alpine314WithNode:
142-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.14-WithNode
143-
ubuntu1804CrossArmAlpine:
144-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine
145-
ubuntu1804CrossArm64Alpine:
146-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-alpine
141+
alpine319WithNode:
142+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
143+
mariner20CrossArmAlpine:
144+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
145+
mariner20CrossArm64Alpine:
146+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
147147
stages:
148148
- stage: build
149149
displayName: Build
@@ -477,7 +477,7 @@ extends:
477477
jobName: Linux_musl_x64_build
478478
jobDisplayName: "Build: Linux Musl x64"
479479
agentOs: Linux
480-
container: alpine314WithNode
480+
container: alpine319WithNode
481481
buildArgs:
482482
--arch x64
483483
--os-name linux-musl
@@ -512,7 +512,7 @@ extends:
512512
jobDisplayName: "Build: Linux Musl ARM"
513513
agentOs: Linux
514514
useHostedUbuntu: false
515-
container: ubuntu1804CrossArmAlpine
515+
container: mariner20CrossArmAlpine
516516
buildArgs:
517517
--arch arm
518518
--os-name linux-musl
@@ -546,7 +546,7 @@ extends:
546546
jobDisplayName: "Build: Linux Musl ARM64"
547547
agentOs: Linux
548548
useHostedUbuntu: false
549-
container: ubuntu1804CrossArm64Alpine
549+
container: mariner20CrossArm64Alpine
550550
buildArgs:
551551
--arch arm64
552552
--os-name linux-musl
@@ -675,7 +675,7 @@ extends:
675675
parameters:
676676
platform:
677677
name: 'Managed'
678-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
678+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
679679
buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
680680
skipPublishValidation: true
681681
jobProperties:

eng/targets/Helix.Common.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<!-- This file is shared between Helix.proj and .csproj files. -->
33
<PropertyGroup>
4-
<HelixQueueAlmaLinux8>(AlmaLinux.8.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64</HelixQueueAlmaLinux8>
5-
<HelixQueueAlpine316>(Alpine.316.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:alpine-3.16-helix-amd64</HelixQueueAlpine316>
6-
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
7-
<HelixQueueFedora34>(Fedora.34.Amd64.Open)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:fedora-34-helix</HelixQueueFedora34>
8-
<HelixQueueMariner>(Mariner)Ubuntu.2004[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
9-
<HelixQueueArmDebian12>(Debian.12.Arm64.Open)ubuntu.2004[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8</HelixQueueArmDebian12>
4+
<HelixQueueAlmaLinux8>(AlmaLinux.8.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64</HelixQueueAlmaLinux8>
5+
<HelixQueueAlpine317>(Alpine.317.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64</HelixQueueAlpine317>
6+
<HelixQueueDebian11>(Debian.11.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64</HelixQueueDebian11>
7+
<HelixQueueFedora38>(Fedora.38.Amd64.Open)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:fedora-38-helix</HelixQueueFedora38>
8+
<HelixQueueMariner>(Mariner)Ubuntu.2204[email protected]/dotnet-buildtools/prereqs:cbl-mariner-1.0-helix</HelixQueueMariner>
9+
<HelixQueueArmDebian12>(Debian.12.Arm64.Open)ubuntu.2204[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8</HelixQueueArmDebian12>
1010

1111
<!-- Do not attempt to override global property. -->
1212
<RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
@@ -42,9 +42,9 @@
4242
<HelixAvailableTargetQueue Include="$(HelixQueueAlmaLinux8)" Platform="Linux" />
4343

4444
<!-- Containers -->
45-
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine316)" Platform="Linux" />
45+
<HelixAvailableTargetQueue Include="$(HelixQueueAlpine317)" Platform="Linux" />
4646
<HelixAvailableTargetQueue Include="$(HelixQueueDebian11)" Platform="Linux" />
47-
<HelixAvailableTargetQueue Include="$(HelixQueueFedora34)" Platform="Linux" />
47+
<HelixAvailableTargetQueue Include="$(HelixQueueFedora38)" Platform="Linux" />
4848
<HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />
4949
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian12)" Platform="Linux" />
5050

0 commit comments

Comments
 (0)