Skip to content

Commit 754d9ec

Browse files
authored
Use Ubuntu 22.04 for runtime-dev-innerloop (#85836)
This makes the innerloop runs more reflective on a typical dev environment - a recent Ubuntu, and not a cross build. These images don't have `lld` (see dotnet/dotnet-buildtools-prereqs-docker#865).
1 parent ee84d8d commit 754d9ec

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

eng/pipelines/common/platform-matrix.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,26 @@ jobs:
249249
disableClrTest: true
250250
${{ insert }}: ${{ parameters.jobParameters }}
251251

252+
# Runtime-dev-innerloop build
253+
254+
- ${{ if containsValue(parameters.platforms, 'linux_x64_dev_innerloop') }}:
255+
- template: xplat-setup.yml
256+
parameters:
257+
jobTemplate: ${{ parameters.jobTemplate }}
258+
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
259+
variables: ${{ parameters.variables }}
260+
osGroup: linux
261+
archType: x64
262+
targetRid: linux-x64
263+
platform: linux_x64
264+
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
265+
container: linux_x64_dev_innerloop
266+
jobParameters:
267+
runtimeFlavor: ${{ parameters.runtimeFlavor }}
268+
buildConfig: ${{ parameters.buildConfig }}
269+
helixQueueGroup: ${{ parameters.helixQueueGroup }}
270+
${{ insert }}: ${{ parameters.jobParameters }}
271+
252272
# Centos 7 x64 Source Build
253273

254274
- ${{ if containsValue(parameters.platforms, 'SourceBuild_centos7_x64') }}:

eng/pipelines/common/templates/pipeline-with-resources.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ resources:
4848
env:
4949
ROOTFS_DIR: /crossrootfs/x86
5050

51+
- container: linux_x64_dev_innerloop
52+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
53+
5154
# CentOS 8 Stream is the closest image to RHEL8, which has the oldest toolsets we support building against
5255
# for our source-build partners.
5356
- container: SourceBuild_linux_x64

eng/pipelines/global-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ extends:
9090
jobTemplate: /eng/pipelines/common/global-build-job.yml
9191
buildConfig: debug
9292
platforms:
93-
- linux_x64
93+
- linux_x64_dev_innerloop
9494
jobParameters:
9595
testGroup: innerloop
9696
nameSuffix: Runtime_Release
@@ -111,7 +111,7 @@ extends:
111111
jobTemplate: /eng/pipelines/common/global-build-job.yml
112112
buildConfig: debug
113113
platforms:
114-
- linux_x64
114+
- linux_x64_dev_innerloop
115115
jobParameters:
116116
testGroup: innerloop
117117
nameSuffix: RuntimeFlavor_Mono
@@ -151,7 +151,7 @@ extends:
151151
jobTemplate: /eng/pipelines/common/global-build-job.yml
152152
buildConfig: debug
153153
platforms:
154-
- linux_x64
154+
- linux_x64_dev_innerloop
155155
jobParameters:
156156
nameSuffix: Libraries_AllConfigurations
157157
buildArgs: -subset libs -allconfigurations

0 commit comments

Comments
 (0)