[automated] Merge branch 'release/9.0.2xx' => 'release/9.0.3xx' (#46597)

dotnet · Feb 7, 2025 · 3d92c95 · 3d92c95
2 parents f5d2584 + a45087e
commit 3d92c95
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 38 deletions.
diff --git 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
@@ -125,14 +125,13 @@ 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}_Offline_PreviousSourceBuiltSdk', variables.alpinePreviousName) }}
+          buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
           isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
           vmrBranch: ${{ variables.VmrBranch }}
           architecture: x64
-          artifactsRid: ${{ variables.alpinePreviousX64Rid }}
+          artifactsRid: ${{ variables.centOSStreamX64Rid }}
           pool: ${{ parameters.pool_Linux }}
-          container: ${{ variables.alpinePreviousContainer }}
-          targetRid: ${{ variables.alpinePreviousX64Rid }}
+          container: ${{ variables.centOSStreamContainer }}
           buildFromArchive: false            # 🚫
           buildSourceOnly: true              # ✅
           enablePoison: true                 # ✅
@@ -166,18 +165,18 @@ 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_MsftSdk', variables.alpineLatestName) }}
+            buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }}
             isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
             vmrBranch: ${{ variables.VmrBranch }}
             architecture: x64
             pool: ${{ parameters.pool_Linux }}
-            container: ${{ variables.alpineLatestContainer }}
-            targetRid: ${{ variables.alpineLatestX64Rid }}
+            container: ${{ variables.alpineContainer }}
+            targetRid: ${{ variables.alpineX64Rid }}
             buildFromArchive: false            # 🚫
             buildSourceOnly: true              # ✅
             enablePoison: false                # 🚫
             excludeOmniSharpTests: true        # ✅
-            runOnline: true                    # ✅
+            runOnline: false                   # 🚫
             useMonoRuntime: false              # 🚫
             withPreviousSDK: false             # 🚫
 
@@ -216,24 +215,6 @@ stages:
             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: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
-            isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-            vmrBranch: ${{ variables.VmrBranch }}
-            architecture: x64
-            artifactsRid: ${{ variables.centOSStreamX64Rid }}
-            pool: ${{ parameters.pool_Linux }}
-            container: ${{ variables.centOSStreamContainer }}
-            buildFromArchive: false            # 🚫
-            buildSourceOnly: true              # ✅
-            enablePoison: false                # 🚫
-            excludeOmniSharpTests: true        # ✅
-            runOnline: false                   # 🚫
-            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

diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml
@@ -14,10 +14,8 @@ variables:
 
 - name: almaLinuxContainer
   value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
-- name: alpineLatestContainer
+- name: alpineContainer
   value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64
-- name: alpinePreviousContainer
-  value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
 - name: centOSStreamContainer
   value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
 - name: fedoraContainer
@@ -49,10 +47,8 @@ variables:
 
 - name: almaLinuxName
   value: AlmaLinux8
-- name: alpineLatestName
+- name: alpineName
   value: Alpine321
-- name: alpinePreviousName
-  value: Alpine320
 - name: centOSStreamName
   value: CentOSStream9
 - name: fedoraName
@@ -68,10 +64,8 @@ variables:
   value: linux-musl-arm
 - name: linuxMuslArm64Rid
   value: linux-musl-arm64
-- name: alpineLatestX64Rid
+- name: alpineX64Rid
   value: alpine.3.21-x64
-- name: alpinePreviousX64Rid
-  value: alpine.3.20-x64
 - name: centOSStreamX64Rid
   value: centos.9-x64
 - name: fedoraX64Rid

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
@@ -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 }}