Skip to content

Commit 658bdd0

Browse files
richlanderjkoritzinskyakoeplingerivdiazsa
authored
Upgrade all VMs to AMD64 Ubuntu 22.04 (#86194)
* Upgrade all VMs to Ubuntu 22.04 * Update display names * Revert wasm and mono back to 18.04 * Update eng/pipelines/coreclr/templates/helix-queues-setup.yml Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com> * Fix merge conflicts * Update Android queue * Removed an Ubuntu.1804.Tiger queue I accidentally enabled when merging with main earlier. * Restored the Ubuntu 18.04 OS for the crossgen tiger perf queue due to a requirement currently unavailable on 22.04 * Restored Ubuntu 18.04 in source-build.yml because those changes come from the arcade repo. * Fix bad merge --------- Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com> Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com> Co-authored-by: Ivan Diaz Sanchez <ivdiazsa@microsoft.com>
1 parent dd98064 commit 658bdd0

File tree

8 files changed

+30
-30
lines changed

8 files changed

+30
-30
lines changed

‎eng/pipelines/common/xplat-setup.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ jobs:
154154
# Public Linux Build Pool
155155
${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), eq(variables['System.TeamProject'], 'public')) }}:
156156
name: $(DncEngPublicBuildPool)
157-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
157+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
158158

159159
# Official Build Linux Pool
160160
${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), ne(variables['System.TeamProject'], 'public')) }}:
161161
name: $(DncEngInternalBuildPool)
162-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
162+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
163163

164164
# OSX Build Pool (we don't have on-prem OSX BuildPool).
165165
${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
# Android x64
5050
- ${{ if in(parameters.platform, 'android_x64') }}:
51-
- Ubuntu.1804.Amd64.Android.29.Open
51+
- Ubuntu.2204.Amd64.Android.29.Open
5252

5353
# Browser wasm
5454
- ${{ if eq(parameters.platform, 'browser_wasm') }}:
@@ -79,9 +79,9 @@ jobs:
7979
# Linux musl x64
8080
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
8181
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
82-
- (Alpine.315.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64
82+
- (Alpine.315.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64
8383
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
84-
- (Alpine.315.Amd64)ubuntu.1804.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64
84+
- (Alpine.315.Amd64)Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64
8585

8686
# Linux musl arm32
8787
- ${{ if eq(parameters.platform, 'linux_musl_arm') }}:
@@ -100,9 +100,9 @@ jobs:
100100
# Linux x64
101101
- ${{ if eq(parameters.platform, 'linux_x64') }}:
102102
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
103-
- Ubuntu.1804.Amd64.Open
103+
- Ubuntu.2204.Amd64.Open
104104
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
105-
- Ubuntu.1804.Amd64
105+
- Ubuntu.2204.Amd64
106106

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

‎eng/pipelines/libraries/enterprise/linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extends:
3939
timeoutInMinutes: 120
4040
pool:
4141
name: $(DncEngPublicBuildPool)
42-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
42+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
4343
steps:
4444
- bash: |
4545
cd $(enterpriseTestsSetup)

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ jobs:
4747
# Linux musl x64
4848
- ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
4949
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
50-
- (Alpine.315.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64
50+
- (Alpine.315.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64
5151
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
52-
- (Alpine.317.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
52+
- (Alpine.317.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
5353

5454
# Linux musl arm64
5555
- ${{ if and(eq(parameters.platform, 'linux_musl_arm64'), or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true))) }}:
@@ -61,25 +61,25 @@ jobs:
6161
- ${{ if and(eq(parameters.jobParameters.interpreter, ''), ne(parameters.jobParameters.isSingleFile, true)) }}:
6262
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
6363
- SLES.15.Amd64.Open
64-
- (Centos.8.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-helix
65-
- (Fedora.38.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix
66-
- (Ubuntu.2204.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64
64+
- (Centos.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-helix
65+
- (Fedora.38.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix
66+
- (Ubuntu.2204.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64
6767
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
6868
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
6969
- ${{ if or(eq(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
7070
- SLES.15.Amd64.Open
71-
- (Fedora.38.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix
71+
- (Fedora.38.Amd64.Open)ubuntu.2204.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-helix
7272
- Ubuntu.2204.Amd64.Open
73-
- (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
74-
- (Mariner.2.0.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
75-
- (openSUSE.15.2.Amd64.Open)ubuntu.1804.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
73+
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
74+
- (Mariner.2.0.Amd64.Open)Ubuntu.2204.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64
75+
- (openSUSE.15.2.Amd64.Open)Ubuntu.2204.Amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
7676
- ${{ if or(ne(parameters.jobParameters.isExtraPlatforms, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
77-
- (Centos.8.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-helix
78-
- (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
79-
- Ubuntu.1804.Amd64.Open
77+
- (Centos.8.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-helix
78+
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
79+
- Ubuntu.2204.Amd64.Open
8080
- ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}:
8181
# Limiting interp runs as we don't need as much coverage.
82-
- (Debian.11.Amd64.Open)Ubuntu.1804.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
82+
- (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64
8383

8484
# Linux s390x
8585
- ${{ if eq(parameters.platform, 'linux_s390x') }}:
@@ -99,7 +99,7 @@ jobs:
9999

100100
# Android
101101
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
102-
- Ubuntu.1804.Amd64.Android.29.Open
102+
- Ubuntu.2204.Amd64.Android.29.Open
103103
- ${{ if in(parameters.platform, 'android_arm', 'android_arm64', 'linux_bionic_arm64') }}:
104104
- Windows.10.Amd64.Android.Open
105105

‎eng/pipelines/libraries/stress/ssl.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extends:
3737
timeoutInMinutes: 120
3838
pool:
3939
name: $(DncEngPublicBuildPool)
40-
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
40+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
4141

4242
steps:
4343
- checkout: self

‎eng/testing/performance/performance-setup.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ benchmark_directory=$payload_directory/BenchmarkDotNet
270270
workitem_directory=$source_directory/workitem
271271
extra_benchmark_dotnet_arguments="--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true"
272272
perflab_arguments=
273-
queue=Ubuntu.1804.Amd64.Open
273+
queue=Ubuntu.2204.Amd64.Open
274274
creator=$BUILD_DEFINITIONNAME
275275
helix_source_prefix="pr"
276276

@@ -285,12 +285,12 @@ if [[ "$internal" == true ]]; then
285285
elif [[ "$logical_machine" == "perfampere" ]]; then
286286
queue=Ubuntu.2004.Arm64.Perf
287287
elif [[ "$logical_machine" == "cloudvm" ]]; then
288-
queue=Ubuntu.1804.Amd64
288+
queue=Ubuntu.2204.Amd64
289289
elif [[ "$architecture" == "arm64" ]]; then
290290
queue=Ubuntu.1804.Arm64.Perf
291291
else
292292
if [[ "$logical_machine" == "perfowl" ]]; then
293-
queue=Ubuntu.1804.Amd64.Owl.Perf
293+
queue=Ubuntu.2204.Amd64.Owl.Perf
294294
elif [[ "$logical_machine" == "perftiger_crossgen" ]]; then
295295
queue=Ubuntu.1804.Amd64.Tiger.Perf
296296
else
@@ -305,7 +305,7 @@ else
305305
if [[ "$architecture" == "arm64" ]]; then
306306
queue=ubuntu.1804.armarch.open
307307
else
308-
queue=Ubuntu.1804.Amd64.Open
308+
queue=Ubuntu.2204.Amd64.Open
309309
fi
310310

311311
if [[ "$alpine" == "true" ]]; then

‎src/coreclr/scripts/superpmi_collect_setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# | Arch | windows | Linux | macOS |
2929
# |-------|-------------------------|--------------------------------------------------------------------------------------------------------------------------------------|----------------|
3030
# | x86 | Windows.10.Amd64.X86.Rt | - | - |
31-
# | x64 | Windows.10.Amd64.X86.Rt | Ubuntu.1804.Amd64 | OSX.1014.Amd64 |
31+
# | x64 | Windows.10.Amd64.X86.Rt | Ubuntu.2204.Amd64 | OSX.1014.Amd64 |
3232
# | arm | - | (Ubuntu.1804.Arm32)Ubuntu.2004.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 | - |
3333
# | arm64 | Windows.11.Arm64 | (Ubuntu.1804.Arm64)Ubuntu.2004.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8 | OSX.1100.ARM64 |
3434
#
@@ -463,7 +463,7 @@ def main(main_args):
463463
elif arch == "arm64":
464464
helix_queue = "(Ubuntu.1804.Arm64)Ubuntu.2004.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8"
465465
else:
466-
helix_queue = "Ubuntu.1804.Amd64"
466+
helix_queue = "Ubuntu.2204.Amd64"
467467
elif platform_name == "osx":
468468
helix_queue = "OSX.1100.ARM64" if arch == "arm64" else "OSX.1014.Amd64"
469469

‎src/tests/Common/helixpublishwitharcade.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<_HelixAccessToken></_HelixAccessToken>
3131
<_HelixBuild></_HelixBuild>
3232
<_HelixSource></_HelixSource>
33-
<_HelixTargetQueues>Ubuntu.1804.Amd64.Open</_HelixTargetQueues>
33+
<_HelixTargetQueues>Ubuntu.2204.Amd64.Open</_HelixTargetQueues>
3434
<_HelixType>test/stuff</_HelixType>
3535
<_PublishTestResults>false</_PublishTestResults>
3636
<_RunCrossGen>false</_RunCrossGen>

0 commit comments

Comments
 (0)