Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"microsoft.dotnet.helix.jobmonitor": {
"version": "12.0.0-beta.26470.102",
"commands": [
"dotnet-helix-job-monitor"
]
}
}
}
8 changes: 8 additions & 0 deletions azure-pipelines-internal-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,11 @@ extends:
HelixAccessToken: $(_HelixAccessToken)
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
- ${{ if or(eq(parameters.jobs, '[]'), contains(parameters.jobs, '"Helix_')) }}:
- template: /eng/common/core-templates/job/helix-job-monitor.yml@self
parameters:
helixAccessToken: $(HelixApiAccessToken)
continueOnError: true
Comment thread
AndriySvyryd marked this conversation as resolved.
- stage: validate
Comment thread
wtgodbe marked this conversation as resolved.
displayName: Validate
dependsOn: build
Expand All @@ -720,6 +725,7 @@ 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: |
$jobResults = @{
Expand All @@ -736,9 +742,11 @@ extends:
Helix_macOS_ARM64 = "$(HelixMacOsArm64Result)"
Helix_Windows_Arm64 = "$(HelixWindowsArm64Result)"
Helix_Ubuntu_Cosmos = "$(HelixUbuntuCosmosResult)"
HelixJobMonitor = "$(HelixJobMonitorResult)"
}

& eng/aggregate-azdo-tests.ps1 -JobResults $jobResults
displayName: Evaluate grouped job outcomes
env:
HELIX_ACCESSTOKEN: $(HelixApiAccessToken)
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
6 changes: 6 additions & 0 deletions azure-pipelines-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,10 @@ stages:
env:
HelixAccessToken: $(_HelixAccessToken)
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
- ${{ if or(eq(parameters.jobs, '[]'), contains(parameters.jobs, '"Helix_')) }}:
- template: /eng/common/core-templates/job/helix-job-monitor.yml
parameters:
continueOnError: true
Comment thread
AndriySvyryd marked this conversation as resolved.
- stage: validate
displayName: Validate
dependsOn: build
Expand All @@ -552,6 +556,7 @@ 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: |
$jobResults = @{
Expand All @@ -568,6 +573,7 @@ stages:
Helix_macOS_ARM64 = "$(HelixMacOsArm64Result)"
Helix_Windows_Arm64 = "$(HelixWindowsArm64Result)"
Helix_Ubuntu_Cosmos = "$(HelixUbuntuCosmosResult)"
HelixJobMonitor = "$(HelixJobMonitorResult)"
}

& eng/aggregate-azdo-tests.ps1 -JobResults $jobResults
Expand Down
2 changes: 2 additions & 0 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ This file should be imported by eng/Versions.props
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>12.0.0-beta.26470.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>12.0.0-beta.26470.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetHelixJobMonitorPackageVersion>12.0.0-beta.26470.102</MicrosoftDotNetHelixJobMonitorPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>12.0.0-beta.26470.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>12.0.0-alpha.1.26470.102</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>12.0.0-alpha.1.26470.102</MicrosoftExtensionsConfigurationPackageVersion>
Expand All @@ -29,6 +30,7 @@ This file should be imported by eng/Versions.props
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetHelixJobMonitorVersion>$(MicrosoftDotNetHelixJobMonitorPackageVersion)</MicrosoftDotNetHelixJobMonitorVersion>
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
<MicrosoftExtensionsCachingMemoryVersion>$(MicrosoftExtensionsCachingMemoryPackageVersion)</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationVersion>
Expand Down
4 changes: 4 additions & 0 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>66551619c00bee615342142059fbd8b9cad2e1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.JobMonitor" Version="12.0.0-beta.26470.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>66551619c00bee615342142059fbd8b9cad2e1af</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="12.0.0-beta.26470.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>66551619c00bee615342142059fbd8b9cad2e1af</Sha>
Expand Down
Loading
Loading