diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 8e4f528e5..530f929b4 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -56,8 +56,8 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode cblMariner20Fpm: image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm - centosStream8: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + centosStream9: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 debian11Amd64: image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 fedora39: @@ -128,8 +128,8 @@ extends: - template: eng/build.yml@self parameters: agentOs: Linux - jobName: Build_CentOS_8_Stream_Debug_x64 - container: centosStream8 + jobName: Build_CentOS_9_Stream_Debug_x64 + container: centosStream9 buildConfiguration: Debug buildArchitecture: x64 linuxPortable: false diff --git a/eng/build-pr.yml b/eng/build-pr.yml index 21393e242..9552a916c 100644 --- a/eng/build-pr.yml +++ b/eng/build-pr.yml @@ -91,10 +91,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 container: ${{ parameters.container }} ${{ if eq(parameters.agentOs, 'Darwin') }}: pool: diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index e40ec7ced..c6fa093a4 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -78,12 +78,12 @@ stages: - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: CentOSStream8_Online_MsftSdk + buildName: CentOSStream9_Online_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 pool: ${{ parameters.pool_Linux }} - container: ${{ variables.centOSStream8Container }} + container: ${{ variables.centOSStream9Container }} buildFromArchive: false # 🚫 buildSourceOnly: true # ✅ enablePoison: false # 🚫 @@ -99,12 +99,12 @@ stages: - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: CentOSStream8_Online_CurrentSourceBuiltSdk + buildName: CentOSStream9_Online_CurrentSourceBuiltSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 pool: ${{ parameters.pool_Linux }} - container: ${{ variables.centOSStream8Container }} + container: ${{ variables.centOSStream9Container }} buildFromArchive: false # 🚫 buildSourceOnly: true # ✅ enablePoison: false # 🚫 @@ -113,7 +113,7 @@ stages: runTests: true # ✅ useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - reuseBuildArtifactsFrom: CentOSStream8_Online_MsftSdk + reuseBuildArtifactsFrom: centOSStream9_Online_MsftSdk - template: ../jobs/vmr-build.yml parameters: @@ -155,80 +155,6 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml - parameters: - # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: CentOSStream8_Offline_MsftSdk - isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} - vmrBranch: ${{ variables.VmrBranch }} - architecture: x64 - pool: ${{ parameters.pool_Linux }} - container: ${{ variables.centOSStream8Container }} - buildFromArchive: true # ✅ - buildSourceOnly: true # ✅ - enablePoison: false # 🚫 - excludeOmniSharpTests: true # ✅ - runOnline: false # 🚫 - runTests: true # ✅ - useMonoRuntime: false # 🚫 - withPreviousSDK: false # 🚫 - - - template: ../jobs/vmr-build.yml - parameters: - # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: CentOSStream8_Online_PreviousSourceBuiltSdk - isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} - vmrBranch: ${{ variables.VmrBranch }} - architecture: x64 - artifactsRid: centos.8-x64 - pool: ${{ parameters.pool_Linux }} - container: ${{ variables.centOSStream8Container }} - buildFromArchive: false # 🚫 - buildSourceOnly: true # ✅ - enablePoison: false # 🚫 - excludeOmniSharpTests: true # ✅ - runOnline: true # ✅ - runTests: true # ✅ - useMonoRuntime: false # 🚫 - withPreviousSDK: true # ✅ - - - template: ../jobs/vmr-build.yml - parameters: - # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: CentOSStream8_Offline_PreviousSourceBuiltSdk - isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} - vmrBranch: ${{ variables.VmrBranch }} - architecture: x64 - artifactsRid: centos.8-x64 - pool: ${{ parameters.pool_Linux }} - container: ${{ variables.centOSStream8Container }} - buildFromArchive: false # 🚫 - buildSourceOnly: true # ✅ - enablePoison: false # 🚫 - excludeOmniSharpTests: true # ✅ - runOnline: false # 🚫 - runTests: true # ✅ - useMonoRuntime: false # 🚫 - withPreviousSDK: true # ✅ - - - template: ../jobs/vmr-build.yml - parameters: - # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: CentOSStream8_Mono_Offline_MsftSdk - isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} - vmrBranch: ${{ variables.VmrBranch }} - architecture: x64 - pool: ${{ parameters.pool_Linux }} - container: ${{ variables.centOSStream8Container }} - buildFromArchive: true # ✅ - buildSourceOnly: true # ✅ - enablePoison: false # 🚫 - excludeOmniSharpTests: true # ✅ - runOnline: false # 🚫 - runTests: true # ✅ - useMonoRuntime: true # ✅ - withPreviousSDK: false # 🚫 - - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline @@ -247,6 +173,62 @@ stages: useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 + - template: ../jobs/vmr-build.yml + parameters: + # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline + buildName: CentOSStream9_Online_PreviousSourceBuiltSdk + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + artifactsRid: centos.9-x64 + pool: ${{ parameters.pool_Linux }} + container: ${{ variables.centOSStream9Container }} + buildFromArchive: false # 🚫 + buildSourceOnly: true # ✅ + enablePoison: false # 🚫 + excludeOmniSharpTests: false # 🚫 + runOnline: true # ✅ + runTests: true # ✅ + useMonoRuntime: false # 🚫 + withPreviousSDK: true # ✅ + + - template: ../jobs/vmr-build.yml + parameters: + # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline + buildName: CentOSStream9_Offline_PreviousSourceBuiltSdk + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + artifactsRid: centos.9-x64 + pool: ${{ parameters.pool_Linux }} + container: ${{ variables.centOSStream9Container }} + buildFromArchive: false # 🚫 + buildSourceOnly: true # ✅ + enablePoison: false # 🚫 + excludeOmniSharpTests: true # ✅ + runOnline: false # 🚫 + runTests: true # ✅ + useMonoRuntime: false # 🚫 + withPreviousSDK: true # ✅ + + - template: ../jobs/vmr-build.yml + parameters: + # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline + buildName: CentOSStream9_Mono_Offline_MsftSdk + isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} + vmrBranch: ${{ variables.VmrBranch }} + architecture: x64 + pool: ${{ parameters.pool_Linux }} + container: ${{ variables.centOSStream9Container }} + buildFromArchive: true # ✅ + buildSourceOnly: true # ✅ + enablePoison: false # 🚫 + excludeOmniSharpTests: true # ✅ + runOnline: false # 🚫 + runTests: true # ✅ + useMonoRuntime: true # ✅ + withPreviousSDK: false # 🚫 + - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index f595feaec..6db4202d9 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -12,8 +12,6 @@ variables: - name: alpine319Container value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode -- name: centOSStream8Container - value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 - name: centOSStream9Container value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - name: fedora39Container diff --git a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml index d6c51cbb5..f3bec625d 100644 --- a/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml @@ -21,20 +21,13 @@ parameters: default: ' ' jobs: -- template: templates/jobs/sdk-diff-tests.yml - parameters: - buildName: CentOSStream8_Offline_MsftSdk - targetRid: centos.8-x64 - architecture: x64 - dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} - includeArtifactsSize: true - - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: CentOSStream9_Offline_MsftSdk targetRid: centos.9-x64 architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} + includeArtifactsSize: true - template: templates/jobs/sdk-diff-tests.yml parameters: diff --git a/src/SourceBuild/content/prep-source-build.sh b/src/SourceBuild/content/prep-source-build.sh index 7b7d4025f..97dd1d038 100755 --- a/src/SourceBuild/content/prep-source-build.sh +++ b/src/SourceBuild/content/prep-source-build.sh @@ -12,7 +12,7 @@ ### --no-prebuilts Exclude the download of the prebuilts archive ### --no-sdk Exclude the download of the .NET SDK ### --artifacts-rid The RID of the previously source-built artifacts archive to download -### Default is centos.8-x64 +### Default is centos.9-x64 ### --runtime-source-feed URL of a remote server or a local directory, from which SDKs and ### runtimes can be downloaded ### --runtime-source-feed-key Key for accessing the above server, if necessary @@ -35,7 +35,7 @@ function print_help () { } # SB prep default arguments -defaultArtifactsRid='centos.8-x64' +defaultArtifactsRid='centos.9-x64' # Binary Tooling default arguments defaultDotnetSdk="$REPO_ROOT/.dotnet"