diff --git a/azure-pipelines-arcade-PR.yml b/azure-pipelines-arcade-PR.yml index 41bf1a540ea..a853d85c5d4 100644 --- a/azure-pipelines-arcade-PR.yml +++ b/azure-pipelines-arcade-PR.yml @@ -40,8 +40,8 @@ variables: resources: containers: - - container: ubuntu_2004_20211215 - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-coredeps + - container: ubuntu_2204 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-coredeps stages: - stage: Build @@ -146,10 +146,10 @@ stages: - ${{ if eq(variables._RunAsPublic, True) }}: - job: Linux timeoutInMinutes: 90 - container: ubuntu_2004_20211215 + container: ubuntu_2204 pool: name: NetCore-Public - demands: ImageOverride -equals build.Ubuntu.2004.Amd64.Open + demands: ImageOverride -equals build.Ubuntu.2204.Amd64.Open variables: - _TestArgs: /p:ServiceUri=$(_serviceUri) /p:Root_Certificate_Installed=true /p:Client_Certificate_Installed=true /p:SSL_Available=true - _serviceUri: diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb9..9f6b3ee9e46 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,7 +60,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 + demands: ImageOverride -equals build.ubuntu.2204.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] image: 1es-mariner-2