From a7d4f9cef5257390ac5f2dbe064f01e4a18bca4e Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 7 Nov 2023 09:27:14 -0600 Subject: [PATCH] [source build] Use floating tags for container image names (#17696) --- eng/common/templates/jobs/source-build.yml | 2 +- .../job/source-build-create-tarball.yml | 2 +- .../job/source-build-run-tarball-build.yml | 20 ++++-------- .../pipelines/security-partners-dotnet.yml | 31 ------------------- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3..7c240e654 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, 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 ac6d73016..347f61cf8 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: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 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.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index e710e1250..bfea7becd 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 @@ -10,13 +10,11 @@ parameters: # The following parameters aren't expected to be passed in rather they are used for encapsulation # ----------------------------------------------------------------------------------------------- alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 - centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build-20210714125450-5d87b80 - centOS8Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-source-build-20211118190102-9355e7b + centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c - debian9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b - debian9Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-arm64v8-20220405201138-a251961 - fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38-20230609193134-47458d2 - ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b + 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 poolInternalAmd64: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 @@ -56,12 +54,6 @@ jobs: _ExcludeOmniSharpTests: true _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - CentOS8-Offline: - _BootstrapPrep: false - _Container: ${{ parameters.centOS8Container }} - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false CentOSStream9-Offline: _BootstrapPrep: false _Container: ${{ parameters.centOSStream9Container }} @@ -97,9 +89,9 @@ jobs: dependsOn: ${{ parameters.dependsOn }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }} matrix: - Debian9-Offline: + Debian11-Offline: _BootstrapPrep: true - _Container: ${{ parameters.debian9Arm64Container }} + _Container: ${{ parameters.debian11Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false _RunOnline: 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 deleted file mode 100644 index 73dd514c5..000000000 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ /dev/null @@ -1,31 +0,0 @@ -trigger: none - -variables: -- name: cfsNPMWarnLevel - value: none - -- name: cfsNugetWarnLevel - value: none - -- name: myGetWarnLevel - value: none - -- name: NuGetSecurityAnalysisWarningLevel - value: none - -jobs: -- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml - parameters: - architecture: x64 - excludeSdkContentTests: true - matrix: - Ubuntu1804-Offline: - _BootstrapPrep: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_x64 - pool: - name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64