Skip to content

Commit b11ee5f

Browse files
premunpremun
committed
Turn on the Helix Monitor Job for the runtime pipeline
1 parent ebc6b06 commit b11ee5f

2 files changed

Lines changed: 47 additions & 29 deletions

File tree

‎eng/pipelines/libraries/helix.yml‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,39 +12,41 @@ parameters:
1212
condition: always()
1313
extraHelixArguments: ''
1414
shouldContinueOnError: false
15+
useHelixMonitor: false
1516
scenarios: ''
1617
SuperPmiCollect: ''
1718
SuperPmiCollectionType: ''
1819
SuperPmiCollectionName: ''
1920

2021
steps:
21-
- script: $(_msbuildCommand) $(_warnAsErrorParamHelixOverride) -restore
22-
$(Build.SourcesDirectory)/src/libraries/sendtohelix.proj
23-
/p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
24-
/p:TargetArchitecture=${{ parameters.archType }}
25-
/p:TargetRuntimeIdentifier=${{ parameters.targetRid }}
26-
/p:Configuration=${{ parameters.buildConfig }}
27-
/p:TargetOS=${{ parameters.osGroup }}
28-
/p:MonoForceInterpreter=${{ parameters.interpreter }}
29-
/p:TestScope=${{ parameters.testScope }}
30-
/p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }}
31-
/p:HelixBuild=$(Build.BuildNumber)
32-
${{ parameters.extraHelixArguments }}
33-
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
34-
displayName: Send to Helix
35-
condition: and(succeeded(), ${{ parameters.condition }})
36-
continueOnError: ${{ eq(parameters.shouldContinueOnError, true) }}
37-
env:
38-
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
39-
_Scenarios: ${{ join(',', parameters.scenarios) }} # Pass scenarios to MSBuild as env var to avoid need of escaping comma separated list
40-
_SuperPmiCollect: ${{ parameters.SuperPmiCollect }}
41-
_SuperPmiCollectionType: ${{ parameters.SuperPmiCollectionType }}
42-
_SuperPmiCollectionName: ${{ parameters.SuperPmiCollectionName }}
22+
- script: $(_msbuildCommand) $(_warnAsErrorParamHelixOverride) -restore
23+
$(Build.SourcesDirectory)/src/libraries/sendtohelix.proj
24+
/p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
25+
/p:TargetArchitecture=${{ parameters.archType }}
26+
/p:TargetRuntimeIdentifier=${{ parameters.targetRid }}
27+
/p:Configuration=${{ parameters.buildConfig }}
28+
/p:TargetOS=${{ parameters.osGroup }}
29+
/p:MonoForceInterpreter=${{ parameters.interpreter }}
30+
/p:TestScope=${{ parameters.testScope }}
31+
/p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }}
32+
/p:HelixBuild=$(Build.BuildNumber)
33+
/p:EnableHelixJobMonitor=${{ parameters.useHelixMonitor }}
34+
${{ parameters.extraHelixArguments }}
35+
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
36+
displayName: Send to Helix
37+
condition: and(succeeded(), ${{ parameters.condition }})
38+
continueOnError: ${{ eq(parameters.shouldContinueOnError, true) }}
39+
env:
40+
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
41+
_Scenarios: ${{ join(',', parameters.scenarios) }} # Pass scenarios to MSBuild as env var to avoid need of escaping comma separated list
42+
_SuperPmiCollect: ${{ parameters.SuperPmiCollect }}
43+
_SuperPmiCollectionType: ${{ parameters.SuperPmiCollectionType }}
44+
_SuperPmiCollectionName: ${{ parameters.SuperPmiCollectionName }}
4345

44-
${{ if eq(variables['System.TeamProject'], 'internal') }}:
45-
HelixAccessToken: $(HelixApiAccessToken)
46-
HelixTargetQueues: ${{ replace(lower(join('+', parameters.helixQueues)), '.open', '') }}
47-
Creator: ''
48-
${{ if eq(variables['System.TeamProject'], 'public') }}:
49-
HelixTargetQueues: ${{ join('+', parameters.helixQueues) }}
50-
Creator: ${{ parameters.creator }}
46+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
47+
HelixAccessToken: $(HelixApiAccessToken)
48+
HelixTargetQueues: ${{ replace(lower(join('+', parameters.helixQueues)), '.open', '') }}
49+
Creator: ''
50+
${{ if eq(variables['System.TeamProject'], 'public') }}:
51+
HelixTargetQueues: ${{ join('+', parameters.helixQueues) }}
52+
Creator: ${{ parameters.creator }}

‎eng/pipelines/runtime.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,7 @@ extends:
797797
parameters:
798798
creator: dotnet-bot
799799
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
800+
useHelixMonitor: true
800801
condition: >-
801802
or(
802803
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -1093,6 +1094,7 @@ extends:
10931094
parameters:
10941095
creator: dotnet-bot
10951096
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
1097+
useHelixMonitor: true
10961098
condition: >-
10971099
or(
10981100
eq(variables['librariesContainsChange'], true),
@@ -1135,6 +1137,7 @@ extends:
11351137
parameters:
11361138
creator: dotnet-bot
11371139
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
1140+
useHelixMonitor: true
11381141
condition: >-
11391142
or(
11401143
eq(variables['librariesContainsChange'], true),
@@ -1179,6 +1182,7 @@ extends:
11791182
parameters:
11801183
creator: dotnet-bot
11811184
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
1185+
useHelixMonitor: true
11821186
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
11831187
condition: >-
11841188
or(
@@ -1223,6 +1227,7 @@ extends:
12231227
parameters:
12241228
creator: dotnet-bot
12251229
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
1230+
useHelixMonitor: true
12261231
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
12271232
condition: >-
12281233
or(
@@ -1267,6 +1272,7 @@ extends:
12671272
parameters:
12681273
creator: dotnet-bot
12691274
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
1275+
useHelixMonitor: true
12701276
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
12711277
condition: >-
12721278
or(
@@ -1310,6 +1316,7 @@ extends:
13101316
parameters:
13111317
creator: dotnet-bot
13121318
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
1319+
useHelixMonitor: true
13131320
condition: >-
13141321
or(
13151322
eq(variables['librariesContainsChange'], true),
@@ -1352,6 +1359,7 @@ extends:
13521359
parameters:
13531360
creator: dotnet-bot
13541361
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
1362+
useHelixMonitor: true
13551363
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
13561364
condition: >-
13571365
or(
@@ -1394,6 +1402,7 @@ extends:
13941402
parameters:
13951403
creator: dotnet-bot
13961404
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
1405+
useHelixMonitor: true
13971406
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
13981407
condition: >-
13991408
or(
@@ -1517,6 +1526,7 @@ extends:
15171526
parameters:
15181527
creator: dotnet-bot
15191528
testRunNamePrefixSuffix: NET481_$(_BuildConfig)
1529+
useHelixMonitor: true
15201530
extraHelixArguments: /p:BuildTargetFramework=net481
15211531
condition: >-
15221532
or(
@@ -2039,6 +2049,7 @@ extends:
20392049
parameters:
20402050
creator: dotnet-bot
20412051
testRunNamePrefixSuffix: Mono_Interpreter_$(_BuildConfig)
2052+
useHelixMonitor: true
20422053
interpreter: true
20432054
condition: >-
20442055
or(
@@ -2071,8 +2082,13 @@ extends:
20712082
parameters:
20722083
creator: dotnet-bot
20732084
testRunNamePrefixSuffix: Mono_Minijit_$(_BuildConfig)
2085+
useHelixMonitor: true
20742086
condition: >-
20752087
or(
20762088
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
20772089
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
20782090
eq(variables['isRollingBuild'], true))
2091+
2092+
- template: /eng/common/core-templates/job/helix-job-monitor.yml
2093+
parameters:
2094+
timeoutInMinutes: 540

0 commit comments

Comments
 (0)