Skip to content

Commit b7153eb

Browse files
authored
[release/9.0] Remove alpine n-1 leg (#46068)
1 parent e531d20 commit b7153eb

File tree

4 files changed

+13
-38
lines changed

4 files changed

+13
-38
lines changed

eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ jobs:
276276
fi
277277
278278
if [[ '${{ parameters.withPreviousSDK }}' == 'True' ]]; then
279-
# Source-built artifacts are from CentOS 9 Stream or Alpine 3.19. We want to download them without
279+
# Source-built artifacts are from CentOS 9 Stream. We want to download them without
280280
# downloading portable versions from the internet.
281281
customPrepArgs="${customPrepArgs} --no-sdk --no-bootstrap"
282282
prepSdk=false

eng/pipelines/templates/stages/vmr-build.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,13 @@ stages:
125125
- template: ../jobs/vmr-build.yml
126126
parameters:
127127
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
128-
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.alpinePreviousName) }}
128+
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
129129
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
130130
vmrBranch: ${{ variables.VmrBranch }}
131131
architecture: x64
132-
artifactsRid: ${{ variables.alpinePreviousX64Rid }}
132+
artifactsRid: ${{ variables.centOSStreamX64Rid }}
133133
pool: ${{ parameters.pool_Linux }}
134-
container: ${{ variables.alpinePreviousContainer }}
135-
targetRid: ${{ variables.alpinePreviousX64Rid }}
134+
container: ${{ variables.centOSStreamContainer }}
136135
buildFromArchive: false # 🚫
137136
buildSourceOnly: true #
138137
enablePoison: true #
@@ -166,18 +165,18 @@ stages:
166165
- template: ../jobs/vmr-build.yml
167166
parameters:
168167
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
169-
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }}
168+
buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }}
170169
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
171170
vmrBranch: ${{ variables.VmrBranch }}
172171
architecture: x64
173172
pool: ${{ parameters.pool_Linux }}
174-
container: ${{ variables.alpineLatestContainer }}
175-
targetRid: ${{ variables.alpineLatestX64Rid }}
173+
container: ${{ variables.alpineContainer }}
174+
targetRid: ${{ variables.alpineX64Rid }}
176175
buildFromArchive: false # 🚫
177176
buildSourceOnly: true #
178177
enablePoison: false # 🚫
179178
excludeOmniSharpTests: true #
180-
runOnline: true #
179+
runOnline: false # 🚫
181180
useMonoRuntime: false # 🚫
182181
withPreviousSDK: false # 🚫
183182

@@ -216,24 +215,6 @@ stages:
216215
useMonoRuntime: false # 🚫
217216
withPreviousSDK: true #
218217

219-
- template: ../jobs/vmr-build.yml
220-
parameters:
221-
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
222-
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.centOSStreamName) }}
223-
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
224-
vmrBranch: ${{ variables.VmrBranch }}
225-
architecture: x64
226-
artifactsRid: ${{ variables.centOSStreamX64Rid }}
227-
pool: ${{ parameters.pool_Linux }}
228-
container: ${{ variables.centOSStreamContainer }}
229-
buildFromArchive: false # 🚫
230-
buildSourceOnly: true #
231-
enablePoison: false # 🚫
232-
excludeOmniSharpTests: true #
233-
runOnline: false # 🚫
234-
useMonoRuntime: false # 🚫
235-
withPreviousSDK: true #
236-
237218
- template: ../jobs/vmr-build.yml
238219
parameters:
239220
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline

eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ variables:
1414

1515
- name: almaLinuxContainer
1616
value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
17-
- name: alpineLatestContainer
17+
- name: alpineContainer
1818
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64
19-
- name: alpinePreviousContainer
20-
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
2119
- name: centOSStreamContainer
2220
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
2321
- name: fedoraContainer
@@ -49,10 +47,8 @@ variables:
4947

5048
- name: almaLinuxName
5149
value: AlmaLinux8
52-
- name: alpineLatestName
50+
- name: alpineName
5351
value: Alpine321
54-
- name: alpinePreviousName
55-
value: Alpine320
5652
- name: centOSStreamName
5753
value: CentOSStream9
5854
- name: fedoraName
@@ -68,10 +64,8 @@ variables:
6864
value: linux-musl-arm
6965
- name: linuxMuslArm64Rid
7066
value: linux-musl-arm64
71-
- name: alpineLatestX64Rid
67+
- name: alpineX64Rid
7268
value: alpine.3.21-x64
73-
- name: alpinePreviousX64Rid
74-
value: alpine.3.20-x64
7569
- name: centOSStreamX64Rid
7670
value: centos.9-x64
7771
- name: fedoraX64Rid

src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ jobs:
5757

5858
- template: templates/jobs/sdk-diff-tests.yml
5959
parameters:
60-
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }}
61-
targetRid: ${{ variables.alpineLatestX64Rid }}
60+
buildName: ${{ format('{0}_Offline_MsftSdk', variables.alpineName) }}
61+
targetRid: ${{ variables.alpineX64Rid }}
6262
architecture: x64
6363
dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }}
6464

0 commit comments

Comments
 (0)