From db524e423e3426eb1ec4dbf01eeb297f903a94b8 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 5 Aug 2026 09:01:17 -0700 Subject: [PATCH 1/2] Enable Helix Job Monitor Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .config/dotnet-tools.json | 12 ++++++++++++ azure-pipelines-internal-tests.yml | 3 +++ azure-pipelines-public.yml | 1 + eng/Version.Details.props | 2 ++ eng/Version.Details.xml | 4 ++++ eng/helix.proj | 1 + 6 files changed, 23 insertions(+) create mode 100644 .config/dotnet-tools.json diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json new file mode 100644 index 00000000000..d104beb316e --- /dev/null +++ b/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "microsoft.dotnet.helix.jobmonitor": { + "version": "11.0.0-beta.26401.101", + "commands": [ + "dotnet-helix-job-monitor" + ] + } + } +} diff --git a/azure-pipelines-internal-tests.yml b/azure-pipelines-internal-tests.yml index da4325a67e7..67b72f81415 100644 --- a/azure-pipelines-internal-tests.yml +++ b/azure-pipelines-internal-tests.yml @@ -645,6 +645,9 @@ extends: HelixAccessToken: $(_HelixAccessToken) SYSTEM_ACCESSTOKEN: $(System.AccessToken) DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token) + - template: /eng/common/core-templates/job/helix-job-monitor.yml@self + parameters: + helixAccessToken: $(HelixApiAccessToken) - stage: validate displayName: Validate dependsOn: build diff --git a/azure-pipelines-public.yml b/azure-pipelines-public.yml index fd68cf6c873..e1e953a7b5d 100644 --- a/azure-pipelines-public.yml +++ b/azure-pipelines-public.yml @@ -509,6 +509,7 @@ stages: env: HelixAccessToken: $(_HelixAccessToken) SYSTEM_ACCESSTOKEN: $(System.AccessToken) + - template: /eng/common/core-templates/job/helix-job-monitor.yml - stage: validate displayName: Validate dependsOn: build diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 142cdd226f9..2dd071adb12 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,6 +8,7 @@ This file should be imported by eng/Versions.props 11.0.0-beta.26401.101 11.0.0-beta.26401.101 + 11.0.0-beta.26401.101 11.0.0-beta.26401.101 11.0.0-rc.1.26401.101 11.0.0-rc.1.26401.101 @@ -29,6 +30,7 @@ This file should be imported by eng/Versions.props $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetHelixJobMonitorPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftExtensionsCachingMemoryPackageVersion) $(MicrosoftExtensionsConfigurationPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fa787159b9..a822ba32a54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,6 +68,10 @@ https://github.com/dotnet/dotnet 5da2de22f7c6e2ebe7ed4c16c614b00183145d3c + + https://github.com/dotnet/dotnet + 5da2de22f7c6e2ebe7ed4c16c614b00183145d3c + https://github.com/dotnet/dotnet 5da2de22f7c6e2ebe7ed4c16c614b00183145d3c diff --git a/eng/helix.proj b/eng/helix.proj index 3dfca72e27d..8d341f9724e 100644 --- a/eng/helix.proj +++ b/eng/helix.proj @@ -11,6 +11,7 @@ $(NETCoreSdkVersion) true + true true $(RepoRoot)/test/EFCore.SqlServer.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.SqlServer.HierarchyId.Tests/*.csproj;$(RepoRoot)/test/EFCore.CrossStore.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.OData.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.AspNet.SqlServer.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.VisualBasic.FunctionalTests/*.vbproj;$(RepoRoot)/test/EFCore.FSharp.FunctionalTests/*.fsproj $(RepoRoot)/test/EFCore.Cosmos.FunctionalTests/*.csproj From 34bf52554862a3d21addcb1645a38b9cf0b4e63e Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 5 Aug 2026 10:34:07 -0700 Subject: [PATCH 2/2] Validate Helix monitor result Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- azure-pipelines-internal-tests.yml | 10 ++++++++++ azure-pipelines-public.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/azure-pipelines-internal-tests.yml b/azure-pipelines-internal-tests.yml index 67b72f81415..d09e30640eb 100644 --- a/azure-pipelines-internal-tests.yml +++ b/azure-pipelines-internal-tests.yml @@ -673,8 +673,18 @@ extends: HelixMacOsArm64Result: $[ stageDependencies.build.Helix_macOS_ARM64.result ] HelixWindowsArm64Result: $[ stageDependencies.build.Helix_Windows_Arm64.result ] HelixUbuntuCosmosResult: $[ stageDependencies.build.Helix_Ubuntu_Cosmos.result ] + HelixJobMonitorResult: $[ stageDependencies.build.HelixJobMonitor.result ] steps: - pwsh: | + $helixJobMonitorResult = "$(HelixJobMonitorResult)" + Write-Host "Helix Job Monitor result: $helixJobMonitorResult" + + if ($helixJobMonitorResult -ne 'Succeeded') + { + Write-Error "Helix Job Monitor did not succeed: $helixJobMonitorResult." + exit 1 + } + $groupResults = @{ Windows = @("$(WindowsResult)", "$(HelixWindowsResult)") Linux = @("$(LinuxResult)", "$(HelixUbuntuResult)") diff --git a/azure-pipelines-public.yml b/azure-pipelines-public.yml index e1e953a7b5d..bc7715b8c2d 100644 --- a/azure-pipelines-public.yml +++ b/azure-pipelines-public.yml @@ -534,8 +534,18 @@ stages: HelixMacOsArm64Result: $[ stageDependencies.build.Helix_macOS_ARM64.result ] HelixWindowsArm64Result: $[ stageDependencies.build.Helix_Windows_Arm64.result ] HelixUbuntuCosmosResult: $[ stageDependencies.build.Helix_Ubuntu_Cosmos.result ] + HelixJobMonitorResult: $[ stageDependencies.build.HelixJobMonitor.result ] steps: - pwsh: | + $helixJobMonitorResult = "$(HelixJobMonitorResult)" + Write-Host "Helix Job Monitor result: $helixJobMonitorResult" + + if ($helixJobMonitorResult -ne 'Succeeded') + { + Write-Error "Helix Job Monitor did not succeed: $helixJobMonitorResult." + exit 1 + } + $groupResults = @{ Windows = @("$(WindowsResult)", "$(HelixWindowsResult)") Linux = @("$(LinuxResult)", "$(HelixUbuntuResult)")