From b8ab11500da162711745c2c478b893520c97b6c7 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Fri, 17 Jan 2025 00:07:14 +0000 Subject: [PATCH] Remove alpine n-1 leg --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- eng/pipelines/templates/stages/vmr-build.yml | 42 ++++++------------- .../templates/variables/vmr-build.yml | 4 +- .../pipelines/source-build-sdk-diff-tests.yml | 4 +- 4 files changed, 16 insertions(+), 36 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 28d20caed157..ed26146de067 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -276,7 +276,7 @@ jobs: fi if [[ '${{ parameters.withPreviousSDK }}' == 'True' ]]; then - # Source-built artifacts are from CentOS 9 Stream or Alpine 3.19. We want to download them without + # Source-built artifacts are from CentOS 9 Stream. We want to download them without # downloading portable versions from the internet. customPrepArgs="${customPrepArgs} --no-sdk --no-bootstrap" prepSdk=false diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 005e00d21145..e8cea0a3e277 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -107,39 +107,39 @@ 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: ${{ format('{0}_Online_CurrentSourceBuiltSdk', variables.centOSStreamName) }} + buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }} isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 pool: ${{ parameters.pool_Linux }} - container: ${{ variables.centOSStreamContainer }} + container: ${{ variables.alpineContainer }} + targetRid: ${{ variables.alpineX64Rid }} buildFromArchive: false # 🚫 buildSourceOnly: true # ✅ - enablePoison: false # 🚫 + enablePoison: true # ✅ excludeOmniSharpTests: true # ✅ - runOnline: true # ✅ + runOnline: false # 🚫 useMonoRuntime: false # 🚫 withPreviousSDK: false # 🚫 - reuseBuildArtifactsFrom: ${{ format('{0}_Online_MsftSdk', variables.centOSStreamName) }} + - 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: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.alpinePreviousName) }} + buildName: ${{ format('{0}_Online_CurrentSourceBuiltSdk', variables.centOSStreamName) }} isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 - artifactsRid: ${{ variables.alpinePreviousX64Rid }} pool: ${{ parameters.pool_Linux }} - container: ${{ variables.alpinePreviousContainer }} - targetRid: ${{ variables.alpinePreviousX64Rid }} + container: ${{ variables.centOSStreamContainer }} buildFromArchive: false # 🚫 buildSourceOnly: true # ✅ - enablePoison: true # ✅ + enablePoison: false # 🚫 excludeOmniSharpTests: true # ✅ - runOnline: false # 🚫 + runOnline: true # ✅ useMonoRuntime: false # 🚫 - withPreviousSDK: true # ✅ + withPreviousSDK: false # 🚫 + reuseBuildArtifactsFrom: ${{ format('{0}_Online_MsftSdk', variables.centOSStreamName) }} ### Additional jobs for full build ### - ${{ if in(parameters.scope, 'full') }}: @@ -163,24 +163,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: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }} - isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} - vmrBranch: ${{ variables.VmrBranch }} - architecture: x64 - pool: ${{ parameters.pool_Linux }} - container: ${{ variables.alpineLatestContainer }} - targetRid: ${{ variables.alpineLatestX64Rid }} - buildFromArchive: false # 🚫 - buildSourceOnly: true # ✅ - enablePoison: false # 🚫 - excludeOmniSharpTests: true # ✅ - runOnline: 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 diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index 27c5a7689f1b..ee4e3bacbc70 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -49,10 +49,8 @@ variables: - name: almaLinuxName value: AlmaLinux8 -- name: alpineLatestName +- name: alpineName value: Alpine321 -- name: alpinePreviousName - value: Alpine320 - name: centOSStreamName value: CentOSStream9 - name: fedoraName 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 3a1c9be677c5..98716ac1ec31 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 @@ -57,8 +57,8 @@ jobs: - template: templates/jobs/sdk-diff-tests.yml parameters: - buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }} - targetRid: ${{ variables.alpineLatestX64Rid }} + buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }} + targetRid: ${{ variables.alpineX64Rid }} architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}