From c67756174d3f0b5412b3f8edfff4cc88a629074e Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 22 May 2024 10:43:15 -0500 Subject: [PATCH] [release/6.0.1xx] Update 6.0 source-build CI distro matrix (#19828) Co-authored-by: Matt Thalman --- .vsts-ci.yml | 4 +-- .../job/source-build-create-tarball.yml | 2 +- .../job/source-build-run-tarball-build-pr.yml | 26 +++++++------------ .../job/source-build-run-tarball-build.yml | 26 +++++++------------ .../pipelines/security-partners-dotnet.yml | 4 +-- 5 files changed, 23 insertions(+), 39 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 52443cb34..8d60a5b02 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -63,8 +63,8 @@ extends: template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines parameters: containers: - fedora38: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 + fedora39: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 sdl: sourceAnalysisPool: name: $(DncEngInternalBuildPool) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 7cba0c4ea..d9df2e4e5 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -2,7 +2,7 @@ jobs: - job: Source_Build_Create_Tarball - container: fedora38 + container: fedora39 displayName: Source-Build Create Tarball pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml index 277fee33f..c38b7ce43 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml @@ -12,9 +12,8 @@ parameters: alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 - fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 - ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 + ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 @@ -64,20 +63,13 @@ jobs: _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: true _RunOnline: false - Fedora38-Offline: + Fedora39-Offline: _BootstrapPrep: false - _Container: ${{ parameters.fedora38Container }} + _Container: ${{ parameters.fedora39Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false _RunOnline: false - Ubuntu1804-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.ubuntu1804Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _OverrideDistroDisablingSha1: false - _RunOnline: false name: Build_Tarball_x64 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: @@ -95,9 +87,9 @@ jobs: dependsOn: ${{ parameters.dependsOn }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Debian11-Offline: + Ubuntu2004-Offline: _BootstrapPrep: true - _Container: ${{ parameters.debian11Arm64Container }} + _Container: ${{ parameters.ubuntu2004Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false @@ -116,9 +108,9 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Fedora38-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts - _Container: ${{ parameters.fedora38Container }} + Fedora39-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts + _Container: ${{ parameters.fedora39Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 65b221f27..c13a1778c 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -12,9 +12,8 @@ parameters: alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 - fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 - ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 + ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal image: 1es-ubuntu-2004 @@ -70,20 +69,13 @@ jobs: _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: true _RunOnline: false - Fedora38-Offline: + Fedora39-Offline: _BootstrapPrep: false - _Container: ${{ parameters.fedora38Container }} + _Container: ${{ parameters.fedora39Container }} _EnablePoison: true _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false _RunOnline: false - Ubuntu1804-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.ubuntu1804Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _OverrideDistroDisablingSha1: false - _RunOnline: false name: Build_Tarball_x64 pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: @@ -101,9 +93,9 @@ jobs: dependsOn: ${{ parameters.dependsOn }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Debian11-Offline: + Ubuntu2004-Offline: _BootstrapPrep: true - _Container: ${{ parameters.debian11Arm64Container }} + _Container: ${{ parameters.ubuntu2004Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false @@ -122,9 +114,9 @@ jobs: excludeSdkContentTests: true installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Fedora38-Offline: - _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts - _Container: ${{ parameters.fedora38Container }} + Fedora39-Offline: + _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts + _Container: ${{ parameters.fedora39Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _OverrideDistroDisablingSha1: false diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 9130b7552..b6e0caaa4 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -37,9 +37,9 @@ extends: architecture: x64 excludeSdkContentTests: true matrix: - Ubuntu1804-Offline: + Ubuntu2004-Offline: _BootstrapPrep: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: false