bump Ubuntu from 18.04 to 22.04

microsoft · Apr 8, 2024 · 8606f7c · 8606f7c
1 parent 62f935a
commit 8606f7c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/eng/pipeline/pr-outerloop-pipeline.yml b/eng/pipeline/pr-outerloop-pipeline.yml
@@ -18,8 +18,8 @@ pr:
 
 resources:
   containers:
-    - container: ubuntu1804
-      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20211022152710-047508b
+    - container: ubuntu2204
+      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
     - container: mariner1
       image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
     - container: mariner1arm64

diff --git a/eng/pipeline/pr-pipeline.yml b/eng/pipeline/pr-pipeline.yml
@@ -15,8 +15,8 @@ resources:
     # 1ES PT. However, to share code, use the same names here. Unfortunately the format used here
     # (container: ... image: ...) is not the same as the one 1ES PT uses, so updating these requires
     # separate changes.
-    - container: ubuntu1804
-      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20211022152710-047508b
+    - container: ubuntu2204
+      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
     - container: mariner1
       image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
     - container: mariner1arm64

diff --git a/eng/pipeline/rolling-innerloop-pipeline.yml b/eng/pipeline/rolling-innerloop-pipeline.yml
@@ -36,8 +36,8 @@ extends:
         image: 1es-windows-2022
         os: windows
     containers:
-      ubuntu1804:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20211022152710-047508b
+      ubuntu2204:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
       mariner1:
         image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
       mariner1arm64:

diff --git a/eng/pipeline/rolling-pipeline.yml b/eng/pipeline/rolling-pipeline.yml
@@ -29,8 +29,8 @@ extends:
         image: 1es-windows-2022
         os: windows
     containers:
-      ubuntu1804:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20211022152710-047508b
+      ubuntu2204:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
       mariner1:
         image: golangpublicimages.azurecr.io/go-infra-images/prereqs:cbl-mariner-1.0.20211027-20211201-0cccc22
       mariner1arm64:

diff --git a/eng/pipeline/stages/run-stage.yml b/eng/pipeline/stages/run-stage.yml
@@ -59,7 +59,7 @@ stages:
           ${{ if eq(parameters.builder.os, 'linux') }}:
             ${{ if eq(parameters.builder.hostArch, 'amd64') }}:
               ${{ if eq(parameters.builder.distro, 'ubuntu') }}:
-                container: ubuntu1804
+                container: ubuntu2204
               ${{ else }}:
                 container: mariner1
             ${{ elseif eq(parameters.builder.hostArch, 'arm64') }}: