From 44978f0940b7141d3830f926ec5e7b64cce772c7 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 14 Oct 2024 12:02:35 -0700 Subject: [PATCH] Enable all configurations inner loop (#108848) * Revert "Disable linux-x64 dev-innerloop (#108581)" This reverts commit 7b69459abc771fda88349204654989c69ade0592. * Don't build tests in linux_x64_dev_innerloop Testing to determine if building tests were the source of OOMs in CI --- eng/pipelines/common/platform-matrix.yml | 35 ++++++++++++------------ eng/pipelines/global-build.yml | 4 +-- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 071c779538cd6..23370eabe21a6 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -298,24 +298,23 @@ jobs: # Runtime-dev-innerloop build -# disabled against https://github.com/dotnet/runtime/issues/108821 -#- ${{ if containsValue(parameters.platforms, 'linux_x64_dev_innerloop') }}: -# - template: xplat-setup.yml -# parameters: -# jobTemplate: ${{ parameters.jobTemplate }} -# helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} -# variables: ${{ parameters.variables }} -# osGroup: linux -# archType: x64 -# targetRid: linux-x64 -# platform: linux_x64 -# shouldContinueOnError: ${{ parameters.shouldContinueOnError }} -# container: linux_x64_dev_innerloop -# jobParameters: -# runtimeFlavor: ${{ parameters.runtimeFlavor }} -# buildConfig: ${{ parameters.buildConfig }} -# helixQueueGroup: ${{ parameters.helixQueueGroup }} -# ${{ insert }}: ${{ parameters.jobParameters }} +- ${{ if containsValue(parameters.platforms, 'linux_x64_dev_innerloop') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: x64 + targetRid: linux-x64 + platform: linux_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_x64_dev_innerloop + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} - ${{ if containsValue(parameters.platforms, 'linux_musl_x64_dev_innerloop') }}: - template: xplat-setup.yml diff --git a/eng/pipelines/global-build.yml b/eng/pipelines/global-build.yml index d86d5727e7318..cd63a904a20e5 100644 --- a/eng/pipelines/global-build.yml +++ b/eng/pipelines/global-build.yml @@ -82,7 +82,7 @@ extends: eq(variables['isRollingBuild'], true)) # - # Build Libraries AllConfigurations. This exercises the code path where we build libraries and tests for all + # Build Libraries AllConfigurations. This exercises the code path where we build libraries for all # configurations on a non Windows operating system. # - template: /eng/pipelines/common/platform-matrix.yml @@ -93,7 +93,7 @@ extends: - linux_x64_dev_innerloop jobParameters: nameSuffix: Libraries_AllConfigurations - buildArgs: -subset libs+libs.tests -allconfigurations + buildArgs: -subset libs -allconfigurations timeoutInMinutes: 120 condition: or(