diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 2334c0c56f94e9..48dc185279be19 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -25,6 +25,12 @@ "commands": [ "slngen" ] + }, + "microsoft.dotnet.helix.jobmonitor": { + "version": "11.0.0-beta.26373.5", + "commands": [ + "dotnet-helix-job-monitor" + ] } } } diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ebfc5379e66cb7..05306d5d04d8ae 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,6 +5,8 @@ This file should be imported by eng/Versions.props --> + + 11.0.0-beta.26330.2 5.10.0-1.26365.101 5.10.0-1.26365.101 @@ -120,6 +122,8 @@ This file should be imported by eng/Versions.props + + $(MicrosoftDotNetHelixJobMonitorPackageVersion) $(MicrosoftCodeAnalysisPackageVersion) $(MicrosoftCodeAnalysisAnalyzersPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e35e8318aa0e74..f72d1cacb39b8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,9 +63,13 @@ https://github.com/dotnet/dotnet cb8306a63c5cf24e9381108a3a9eb58907fd0f60 - + + https://github.com/dotnet/arcade + b25932e8d128b5242f1d89691f8e8171b82774c0 + + https://github.com/dotnet/dotnet - cb8306a63c5cf24e9381108a3a9eb58907fd0f60 + b25932e8d128b5242f1d89691f8e8171b82774c0 https://github.com/dotnet/dotnet diff --git a/eng/pipelines/common/templates/browser-wasm-build-tests.yml b/eng/pipelines/common/templates/browser-wasm-build-tests.yml index 3a30ecb19e1dbf..9725c80c11d441 100644 --- a/eng/pipelines/common/templates/browser-wasm-build-tests.yml +++ b/eng/pipelines/common/templates/browser-wasm-build-tests.yml @@ -7,6 +7,7 @@ parameters: platforms: [] shouldContinueOnError: false extraBuildArgs: '' + useHelixMonitor: false # The wasm-tools workload manifest includes the CoreCLR browser-wasm runtime pack, so # installing the workload for testing requires that pack in the local feed. Only pipelines # that build the CoreCLR browser-wasm runtime (e.g. runtime.yml) can stage it here. @@ -161,3 +162,4 @@ jobs: extraHelixArguments: /p:BrowserHost=$(_hostedOs) /maxcpucount:8 scenarios: - buildwasmapps + useHelixMonitor: ${{ parameters.useHelixMonitor }} diff --git a/eng/pipelines/common/templates/browser-wasm-coreclr-build-tests.yml b/eng/pipelines/common/templates/browser-wasm-coreclr-build-tests.yml index 635d669e05af92..27030fb442d7d0 100644 --- a/eng/pipelines/common/templates/browser-wasm-coreclr-build-tests.yml +++ b/eng/pipelines/common/templates/browser-wasm-coreclr-build-tests.yml @@ -7,6 +7,7 @@ parameters: platforms: [] shouldContinueOnError: false extraBuildArgs: '' + useHelixMonitor: false jobs: @@ -146,3 +147,4 @@ jobs: extraHelixArguments: /p:BrowserHost=$(_hostedOs) /maxcpucount:8 scenarios: - buildwasmapps + useHelixMonitor: ${{ parameters.useHelixMonitor }} diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml index ede11d9a9b4996..6bdf98d58f9fa9 100644 --- a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml +++ b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml @@ -13,6 +13,7 @@ parameters: nativeAotTest: false runtimeFlavor: 'mono' runtimeVariant: 'monointerpreter' + useHelixMonitor: false llvmAotStepContainer: '' scenarios: - normal @@ -115,6 +116,7 @@ steps: helixType: 'test/functional/cli/' helixQueues: ${{ parameters.helixQueues }} + useHelixMonitor: ${{ parameters.useHelixMonitor }} # This tests whether an array is empty ${{ if eq(join('', parameters.helixQueues), '') }}: condition: false diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 7068107295653e..1128f36010fd53 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -30,6 +30,7 @@ parameters: unifiedBuildNameSuffix: '' unifiedBuildConfigOverride: '' extraBuildArgs: '' + useHelixMonitor: false ### Test run job @@ -290,6 +291,7 @@ jobs: shouldContinueOnError: ${{ parameters.shouldContinueOnError }} runtimeVariant: ${{ parameters.runtimeVariant }} SuperPmiCollect: ${{ parameters.SuperPmiCollect }} + useHelixMonitor: ${{ parameters.useHelixMonitor }} ${{ if eq(variables['System.TeamProject'], 'public') }}: creator: $(Build.DefinitionName) diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml index 9e66956a3c2547..e959eba200b4cf 100644 --- a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml +++ b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml @@ -12,6 +12,7 @@ parameters: helixSource: '' helixQueues: '' helixType: '' + useHelixMonitor: false msbuildParallelism: '/maxcpucount' scenarios: '' timeoutPerTestCollectionInMinutes: '' @@ -42,7 +43,16 @@ steps: - template: send-to-helix-inner-step.yml parameters: osGroup: ${{ parameters.osGroup }} - sendParams: ${{ parameters.helixProjectArguments }} ${{ parameters.msbuildParallelism }} /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog /p:TargetArchitecture=${{ parameters.archType }} /p:TargetOS=${{ parameters.osGroup }} /p:TargetOSSubgroup=${{ parameters.osSubgroup }} /p:Configuration=${{ parameters.buildConfig }} ${{ parameters.extraHelixArguments }} + sendParams: > + ${{ parameters.helixProjectArguments }} + ${{ parameters.msbuildParallelism }} + /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog + /p:TargetArchitecture=${{ parameters.archType }} + /p:TargetOS=${{ parameters.osGroup }} + /p:TargetOSSubgroup=${{ parameters.osSubgroup }} + /p:Configuration=${{ parameters.buildConfig }} + /p:EnableHelixJobMonitor=${{ parameters.useHelixMonitor }} + ${{ parameters.extraHelixArguments }} condition: and(succeeded(), ${{ parameters.condition }}) shouldContinueOnError: ${{ parameters.shouldContinueOnError }} displayName: ${{ parameters.displayName }} diff --git a/eng/pipelines/common/templates/simple-wasm-build-tests.yml b/eng/pipelines/common/templates/simple-wasm-build-tests.yml index dd7ab4e3e2a99e..8f28db52a75d50 100644 --- a/eng/pipelines/common/templates/simple-wasm-build-tests.yml +++ b/eng/pipelines/common/templates/simple-wasm-build-tests.yml @@ -6,6 +6,7 @@ parameters: platforms: [] shouldContinueOnError: false extraBuildArgs: '' + useHelixMonitor: false jobs: @@ -55,4 +56,5 @@ jobs: extraHelixArguments: /p:BrowserHost=$(_hostedOs) /maxcpucount:8 scenarios: - buildwasmapps + useHelixMonitor: ${{ parameters.useHelixMonitor }} diff --git a/eng/pipelines/common/templates/wasm-coreclr-library-tests.yml b/eng/pipelines/common/templates/wasm-coreclr-library-tests.yml index bf8e7eccb9c91d..61bb488f777113 100644 --- a/eng/pipelines/common/templates/wasm-coreclr-library-tests.yml +++ b/eng/pipelines/common/templates/wasm-coreclr-library-tests.yml @@ -9,6 +9,7 @@ parameters: scenarios: ['WasmTestOnChrome'] shouldContinueOnError: false shouldRunSmokeOnly: false + useHelixMonitor: false jobs: @@ -100,3 +101,4 @@ jobs: testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig) extraHelixArguments: /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) ${{ parameters.extraHelixArguments }} scenarios: ${{ parameters.scenarios }} + useHelixMonitor: ${{ parameters.useHelixMonitor }} diff --git a/eng/pipelines/common/templates/wasm-library-aot-tests.yml b/eng/pipelines/common/templates/wasm-library-aot-tests.yml index d3dbf8d8db6524..87679ac6d3f22a 100644 --- a/eng/pipelines/common/templates/wasm-library-aot-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -11,6 +11,7 @@ parameters: shouldRunSmokeOnly: false shouldContinueOnError: false scenarios: [] + useHelixMonitor: false jobs: @@ -31,6 +32,7 @@ jobs: alwaysRun: ${{ parameters.alwaysRun }} shouldRunSmokeOnly: ${{ parameters.shouldRunSmokeOnly }} shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + useHelixMonitor: ${{ parameters.useHelixMonitor }} scenarios: - ${{ if ne(parameters.scenarios[0], '') }}: - ${{ parameters.scenarios }} diff --git a/eng/pipelines/common/templates/wasm-library-tests.yml b/eng/pipelines/common/templates/wasm-library-tests.yml index 0dcc2ded5f88d2..8cdae3c302bae0 100644 --- a/eng/pipelines/common/templates/wasm-library-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-tests.yml @@ -9,6 +9,7 @@ parameters: scenarios: ['WasmTestOnChrome'] shouldContinueOnError: false shouldRunSmokeOnly: false + useHelixMonitor: false runOnlyOnChromeVersionUpdate: false jobs: @@ -106,3 +107,4 @@ jobs: testRunNamePrefixSuffix: Mono_$(_BuildConfig) extraHelixArguments: /p:BrowserHost=$(_hostedOs) $(_wasmRunSmokeTestsOnlyArg) ${{ parameters.extraHelixArguments }} scenarios: ${{ parameters.scenarios }} + useHelixMonitor: ${{ parameters.useHelixMonitor }} diff --git a/eng/pipelines/common/templates/wasm-runtime-tests.yml b/eng/pipelines/common/templates/wasm-runtime-tests.yml index 8f84bdb93038db..c1e1f4cf7d93f5 100644 --- a/eng/pipelines/common/templates/wasm-runtime-tests.yml +++ b/eng/pipelines/common/templates/wasm-runtime-tests.yml @@ -4,6 +4,7 @@ parameters: isWasmOnlyBuild: false platforms: [] extraBuildArgs: '' + useHelixMonitor: false jobs: @@ -48,5 +49,6 @@ jobs: creator: dotnet-bot testRunNamePrefixSuffix: Mono_$(_BuildConfig) testBuildArgs: /p:InstallV8ForTests=false + useHelixMonitor: ${{ parameters.useHelixMonitor }} extraVariablesTemplates: - template: /eng/pipelines/common/templates/runtimes/test-variables.yml diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 63b9296e0cbb79..74a4d5f945abf0 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -45,6 +45,9 @@ variables: - name: isNotSpecificPlatformOnlyBuild value: ${{ notin(variables['Build.DefinitionName'], 'runtime-wasm', 'runtime-wasm-libtests', 'runtime-wasm-non-libtests', 'runtime-ioslike', 'runtime-ioslikesimulator', 'runtime-android', 'runtime-androidemulator', 'runtime-maccatalyst', 'runtime-linuxbionic') }} +- name: enableHelixJobMonitor + value: true + - name: debugOnPrReleaseOnRolling ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: value: Release diff --git a/eng/pipelines/coreclr/nativeaot-post-build-steps.yml b/eng/pipelines/coreclr/nativeaot-post-build-steps.yml index bc29a657c456ce..9b0182c91d232b 100644 --- a/eng/pipelines/coreclr/nativeaot-post-build-steps.yml +++ b/eng/pipelines/coreclr/nativeaot-post-build-steps.yml @@ -6,6 +6,7 @@ parameters: testBuildArgs: '' helixQueues: '' liveLibrariesBuildConfig: '' + useHelixMonitor: false steps: # Build coreclr native test output and send to helix @@ -21,3 +22,4 @@ steps: nativeAotTest: true helixQueues: ${{ parameters.helixQueues }} liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }} + useHelixMonitor: ${{ parameters.useHelixMonitor }} diff --git a/eng/pipelines/installer/helix.yml b/eng/pipelines/installer/helix.yml index 992c7098e7e566..5824c4366c0f4b 100644 --- a/eng/pipelines/installer/helix.yml +++ b/eng/pipelines/installer/helix.yml @@ -4,6 +4,7 @@ parameters: osSubgroup: '' creator: '' helixQueues: '' + useHelixMonitor: false steps: - template: /eng/common/templates/steps/send-to-helix.yml @@ -36,3 +37,4 @@ steps: ${{ if eq(variables['System.TeamProject'], 'public') }}: Creator: ${{ parameters.creator }} HelixTargetQueues: ${{ join('+', parameters.helixQueues) }} + UseHelixMonitor: ${{ parameters.useHelixMonitor }} diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index 03b3cf1ebaffca..ab8f1f02c6e324 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -12,39 +12,41 @@ parameters: condition: always() extraHelixArguments: '' shouldContinueOnError: false + useHelixMonitor: false scenarios: '' SuperPmiCollect: '' SuperPmiCollectionType: '' SuperPmiCollectionName: '' steps: - - script: $(_msbuildCommand) $(_warnAsErrorParamHelixOverride) -restore - $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj - /p:RuntimeFlavor=${{ parameters.runtimeFlavor }} - /p:TargetArchitecture=${{ parameters.archType }} - /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} - /p:Configuration=${{ parameters.buildConfig }} - /p:TargetOS=${{ parameters.osGroup }} - /p:MonoForceInterpreter=${{ parameters.interpreter }} - /p:TestScope=${{ parameters.testScope }} - /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} - /p:HelixBuild=$(Build.BuildNumber) - ${{ parameters.extraHelixArguments }} - /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog - displayName: Send to Helix - condition: and(succeeded(), ${{ parameters.condition }}) - continueOnError: ${{ eq(parameters.shouldContinueOnError, true) }} - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops - _Scenarios: ${{ join(',', parameters.scenarios) }} # Pass scenarios to MSBuild as env var to avoid need of escaping comma separated list - _SuperPmiCollect: ${{ parameters.SuperPmiCollect }} - _SuperPmiCollectionType: ${{ parameters.SuperPmiCollectionType }} - _SuperPmiCollectionName: ${{ parameters.SuperPmiCollectionName }} +- script: $(_msbuildCommand) $(_warnAsErrorParamHelixOverride) -restore + $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj + /p:RuntimeFlavor=${{ parameters.runtimeFlavor }} + /p:TargetArchitecture=${{ parameters.archType }} + /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} + /p:Configuration=${{ parameters.buildConfig }} + /p:TargetOS=${{ parameters.osGroup }} + /p:MonoForceInterpreter=${{ parameters.interpreter }} + /p:TestScope=${{ parameters.testScope }} + /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} + /p:HelixBuild=$(Build.BuildNumber) + /p:EnableHelixJobMonitor=${{ parameters.useHelixMonitor }} + ${{ parameters.extraHelixArguments }} + /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog + displayName: Send to Helix + condition: and(succeeded(), ${{ parameters.condition }}) + continueOnError: ${{ eq(parameters.shouldContinueOnError, true) }} + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops + _Scenarios: ${{ join(',', parameters.scenarios) }} # Pass scenarios to MSBuild as env var to avoid need of escaping comma separated list + _SuperPmiCollect: ${{ parameters.SuperPmiCollect }} + _SuperPmiCollectionType: ${{ parameters.SuperPmiCollectionType }} + _SuperPmiCollectionName: ${{ parameters.SuperPmiCollectionName }} - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - HelixAccessToken: $(HelixApiAccessToken) - HelixTargetQueues: ${{ replace(lower(join('+', parameters.helixQueues)), '.open', '') }} - Creator: '' - ${{ if eq(variables['System.TeamProject'], 'public') }}: - HelixTargetQueues: ${{ join('+', parameters.helixQueues) }} - Creator: ${{ parameters.creator }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + HelixAccessToken: $(HelixApiAccessToken) + HelixTargetQueues: ${{ replace(lower(join('+', parameters.helixQueues)), '.open', '') }} + Creator: '' + ${{ if eq(variables['System.TeamProject'], 'public') }}: + HelixTargetQueues: ${{ join('+', parameters.helixQueues) }} + Creator: ${{ parameters.creator }} diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index 75f35341da2d97..c766b35f3d0b2d 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -27,6 +27,7 @@ parameters: unifiedBuildNameSuffix: '' unifiedBuildConfigOverride: '' templatePath: 'templates' + useHelixMonitor: false jobs: - template: /eng/common/${{ parameters.templatePath }}/job/job.yml @@ -134,6 +135,8 @@ jobs: ${{ if ne(parameters.scenarios[0], '') }}: scenarios: ${{ parameters.scenarios }} + useHelixMonitor: ${{ parameters.useHelixMonitor }} + - ${{ if eq(parameters.SuperPmiCollect, true) }}: - template: /eng/pipelines/libraries/superpmi-postprocess-step.yml parameters: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 77ec17437b8a1e..9e2a6a03b77a76 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -66,6 +66,11 @@ extends: - stage: Build jobs: + - ${{ if eq(variables['enableHelixJobMonitor'], true) }}: + - template: /eng/common/core-templates/job/helix-job-monitor.yml + parameters: + helixAccessToken: $(HelixApiAccessToken) + timeoutInMinutes: 540 # # Build CoreCLR verticals where we don't run host tests @@ -267,6 +272,7 @@ extends: - browser_wasm_win alwaysRun: ${{ variables.isRollingBuild }} extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} # # Build CoreCLR and Libraries with Libraries tests @@ -724,6 +730,7 @@ extends: testBuildArgs: nativeaot tree nativeaot liveLibrariesBuildConfig: Release testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraVariablesTemplates: - template: /eng/pipelines/common/templates/runtimes/test-variables.yml parameters: @@ -763,6 +770,7 @@ extends: testBuildArgs: 'nativeaot tree ";nativeaot;Loader;Interop;async;" /p:BuildNativeAotFrameworkObjects=true' liveLibrariesBuildConfig: Release testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraVariablesTemplates: - template: /eng/pipelines/common/templates/runtimes/test-variables.yml parameters: @@ -807,6 +815,7 @@ extends: testBuildArgs: 'nativeaot tree ";nativeaot;tracing/eventpipe/providervalidation;"' liveLibrariesBuildConfig: Release testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraVariablesTemplates: - template: /eng/pipelines/common/templates/runtimes/test-variables.yml parameters: @@ -844,6 +853,7 @@ extends: parameters: creator: dotnet-bot testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), @@ -986,6 +996,7 @@ extends: - browser_wasm alwaysRun: ${{ variables.isRollingBuild }} extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} scenarios: - WasmTestOnChrome - WasmTestOnFirefox @@ -996,6 +1007,7 @@ extends: - browser_wasm_win alwaysRun: ${{ variables.isRollingBuild }} extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} scenarios: - WasmTestOnChrome @@ -1008,6 +1020,7 @@ extends: shouldRunSmokeOnly: 'true' nameSuffix: _SmokeMac extraBuildArgs: /p:AotHostArchitecture=arm64 /p:AotHostOS=$(_hostedOS) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} scenarios: - WasmTestOnChrome @@ -1018,6 +1031,7 @@ extends: - browser_wasm alwaysRun: ${{ variables.isRollingBuild }} extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} scenarios: - WasmTestOnChrome @@ -1030,6 +1044,7 @@ extends: shouldRunSmokeOnly: 'true' nameSuffix: _SmokeFirefoxV8 extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} scenarios: - WasmTestOnFirefox - WasmTestOnV8 @@ -1045,6 +1060,7 @@ extends: shouldRunSmokeOnly: false alwaysRun: ${{ variables.isRollingBuild }} extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /maxcpucount:2 + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} # AOT Library tests - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml @@ -1058,6 +1074,7 @@ extends: shouldRunSmokeOnly: true alwaysRun: ${{ variables.isRollingBuild }} extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} # For Wasm.Build.Tests - runtime pack builds - template: /eng/pipelines/common/templates/wasm-build-only.yml @@ -1090,6 +1107,7 @@ extends: - browser_wasm_win alwaysRun: ${{ variables.isRollingBuild }} extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} # This pipeline builds the CoreCLR browser-wasm runtime (nameSuffix: CoreCLR), # so stage its runtime pack for the wasm-tools workload install. includeCoreClrRuntimePack: true @@ -1101,6 +1119,7 @@ extends: - browser_wasm alwaysRun: ${{ variables.isRollingBuild }} extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} # WASI/WASM @@ -1151,6 +1170,7 @@ extends: parameters: creator: dotnet-bot testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(variables['librariesContainsChange'], true), @@ -1193,6 +1213,7 @@ extends: parameters: creator: dotnet-bot testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true condition: >- or( @@ -1238,6 +1259,7 @@ extends: creator: dotnet-bot testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig) extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(variables['librariesContainsChange'], true), @@ -1282,6 +1304,7 @@ extends: creator: dotnet-bot testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig) extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(variables['librariesContainsChange'], true), @@ -1324,6 +1347,7 @@ extends: creator: dotnet-bot testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig) extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(variables['librariesContainsChange'], true), @@ -1446,6 +1470,7 @@ extends: parameters: creator: dotnet-bot testRunNamePrefixSuffix: NET481_$(_BuildConfig) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraHelixArguments: /p:BuildTargetFramework=net481 condition: >- or( @@ -1502,6 +1527,7 @@ extends: - template: /eng/pipelines/installer/helix.yml parameters: creator: dotnet-bot + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), @@ -1534,6 +1560,7 @@ extends: - template: /eng/pipelines/installer/helix.yml parameters: creator: dotnet-bot + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), @@ -1565,6 +1592,7 @@ extends: - template: /eng/pipelines/installer/helix.yml parameters: creator: dotnet-bot + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), @@ -1605,6 +1633,7 @@ extends: parameters: creator: dotnet-bot testRunNamePrefixSuffix: Mono_Release + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraVariablesTemplates: - template: /eng/pipelines/common/templates/runtimes/test-variables.yml @@ -1641,6 +1670,7 @@ extends: parameters: creator: dotnet-bot testRunNamePrefixSuffix: Mono_Release + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraVariablesTemplates: - template: /eng/pipelines/common/templates/runtimes/test-variables.yml parameters: @@ -1679,6 +1709,7 @@ extends: parameters: creator: dotnet-bot testRunNamePrefixSuffix: Mono_Release + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraVariablesTemplates: - template: /eng/pipelines/common/templates/runtimes/test-variables.yml # @@ -1718,6 +1749,7 @@ extends: creator: dotnet-bot llvmAotStepContainer: linux_x64_llvmaot testRunNamePrefixSuffix: Mono_Release + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraVariablesTemplates: - template: /eng/pipelines/common/templates/runtimes/test-variables.yml @@ -1758,6 +1790,7 @@ extends: liveLibrariesBuildConfig: Release unifiedArtifactsName: CoreCLR_ReleaseLibraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) unifiedBuildNameSuffix: CoreCLR_ReleaseLibraries + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), @@ -1777,6 +1810,7 @@ extends: liveLibrariesBuildConfig: Release unifiedArtifactsName: CoreCLR_ReleaseLibraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) unifiedBuildNameSuffix: CoreCLR_ReleaseLibraries + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} extraBuildArgs: -os browser -p:HostConfiguration=Release condition: >- or( @@ -1805,6 +1839,7 @@ extends: unifiedArtifactsName: Libraries_CheckedCoreCLR_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(debugOnPrReleaseOnRolling) unifiedBuildNameSuffix: Libraries_CheckedCoreCLR unifiedBuildConfigOverride: ${{ variables.debugOnPrReleaseOnRolling }} + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), @@ -1829,6 +1864,7 @@ extends: unifiedArtifactsName: CoreCLR_Libraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) helixArtifactsName: CoreCLR_Libraries_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) unifiedBuildNameSuffix: CoreCLR_Libraries + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), @@ -1856,6 +1892,7 @@ extends: helixArtifactsName: CoreCLR_Libraries_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(debugOnPrReleaseOnRolling) unifiedBuildNameSuffix: CoreCLR_Libraries unifiedBuildConfigOverride: ${{ variables.debugOnPrReleaseOnRolling }} + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), @@ -1895,6 +1932,7 @@ extends: unifiedArtifactsName: Libraries_CheckedCoreCLR_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) helixArtifactsName: Libraries_CheckedCoreCLR_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) unifiedBuildNameSuffix: Libraries_CheckedCoreCLR + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), @@ -1922,6 +1960,7 @@ extends: helixArtifactsName: CoreCLR_ReleaseLibraries_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_Checked unifiedBuildNameSuffix: CoreCLR_ReleaseLibraries unifiedBuildConfigOverride: checked + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), @@ -1941,6 +1980,7 @@ extends: unifiedArtifactsName: Libraries_CheckedCoreCLR_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) helixArtifactsName: Libraries_CheckedCoreCLR_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_BuildConfig) unifiedBuildNameSuffix: Libraries_CheckedCoreCLR + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), @@ -1972,6 +2012,7 @@ extends: parameters: creator: dotnet-bot testRunNamePrefixSuffix: Mono_Interpreter_$(_BuildConfig) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} interpreter: true condition: >- or( @@ -2004,6 +2045,7 @@ extends: parameters: creator: dotnet-bot testRunNamePrefixSuffix: Mono_Minijit_$(_BuildConfig) + useHelixMonitor: ${{ variables.enableHelixJobMonitor }} condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index 70e9535a336393..fb64f300b3e28e 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -50,7 +50,8 @@ Scenarios=$(_Scenarios); SuperPmiCollect=$(_SuperPmiCollect); SuperPmiCollectionType=$(_SuperPmiCollectionType); - SuperPmiCollectionName=$(_SuperPmiCollectionName) + SuperPmiCollectionName=$(_SuperPmiCollectionName); + EnableHelixJobMonitor=$(EnableHelixJobMonitor) <_DebuggerHosts Condition="'$(_DebuggerHosts)' == ''">$(DebuggerHost) <_DebuggerHosts Condition="'$(_DebuggerHosts)' == ''">chrome