Skip to content

Commit ec743cb

Browse files
authored
Wire the job monitor flag through YAML correctly (dotnet#133002)
When this was being added (dotnet#132150), it incorrectly wired the variables/parameters through and the MSBuild tasks sending the Helix jobs ended up waiting on the results instead of fire'n'forget
1 parent 36ef186 commit ec743cb

20 files changed

Lines changed: 69 additions & 37 deletions

‎eng/pipelines/coreclr/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,3 +247,5 @@ extends:
247247
nameSuffix: PALTests
248248
postBuildSteps:
249249
- template: /eng/pipelines/coreclr/templates/run-paltests-step.yml
250+
parameters:
251+
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}

‎eng/pipelines/coreclr/templates/run-paltests-step.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ parameters:
55
archType: '' # required -- targeting CPU architecture
66
osGroup: '' # required -- operating system for the job
77
osSubgroup: '' # optional -- operating system subgroup
8+
useHelixMonitor: false
89

910
steps:
1011
- template: /eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
@@ -21,3 +22,4 @@ steps:
2122
archType: ${{ parameters.archType }}
2223
shouldContinueOnError: ${{ parameters.continueOnError }}
2324
publishTestResults: true
25+
useHelixMonitor: ${{ parameters.useHelixMonitor }}

‎eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ parameters:
77
isExtraPlatformsBuild: false
88
isAndroidOnlyBuild: false
99
isRollingBuild: false
10+
useHelixMonitor: false
1011

1112
jobs:
1213

@@ -41,7 +42,7 @@ jobs:
4142
parameters:
4243
creator: dotnet-bot
4344
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
44-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
45+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
4546

4647
#
4748
# Android arm64 devices and x64 emulators
@@ -73,4 +74,4 @@ jobs:
7374
parameters:
7475
creator: dotnet-bot
7576
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
76-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
77+
useHelixMonitor: ${{ parameters.useHelixMonitor }}

‎eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ parameters:
77
isExtraPlatformsBuild: false
88
isAndroidEmulatorOnlyBuild: false
99
isRollingBuild: false
10+
useHelixMonitor: false
1011

1112
jobs:
1213

@@ -46,7 +47,7 @@ jobs:
4647
creator: dotnet-bot
4748
testBuildArgs: nativeaot tree nativeaot/SmokeTests /p:BuildNativeAOTRuntimePack=true
4849
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
49-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
50+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
5051
extraVariablesTemplates:
5152
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
5253

@@ -86,7 +87,7 @@ jobs:
8687
parameters:
8788
creator: dotnet-bot
8889
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
89-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
90+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
9091

9192
#
9293
# Android emulators
@@ -118,7 +119,7 @@ jobs:
118119
parameters:
119120
creator: dotnet-bot
120121
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
121-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
122+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
122123

123124
#
124125
# Android arm64 devices and x64 emulators
@@ -152,4 +153,4 @@ jobs:
152153
parameters:
153154
creator: dotnet-bot
154155
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
155-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
156+
useHelixMonitor: ${{ parameters.useHelixMonitor }}

‎eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ parameters:
77
isExtraPlatformsBuild: false
88
isiOSLikeOnlyBuild: false
99
isRollingBuild: false
10+
useHelixMonitor: false
1011

1112
jobs:
1213

@@ -41,7 +42,7 @@ jobs:
4142
parameters:
4243
creator: dotnet-bot
4344
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
44-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
45+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
4546
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
4647

4748
#
@@ -77,7 +78,7 @@ jobs:
7778
parameters:
7879
creator: dotnet-bot
7980
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
80-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
81+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
8182
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
8283

8384
#
@@ -121,7 +122,7 @@ jobs:
121122
creator: dotnet-bot
122123
testBuildArgs: /p:DevTeamProvisioning=- /p:UseMonoRuntime=false /p:UseNativeAOTRuntime=false /p:BuildTestsOnHelix=true
123124
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
124-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
125+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
125126
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
126127

127128
#
@@ -157,5 +158,5 @@ jobs:
157158
parameters:
158159
creator: dotnet-bot
159160
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
160-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
161+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
161162
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true

‎eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ parameters:
77
isExtraPlatformsBuild: false
88
isiOSLikeSimulatorOnlyBuild: false
99
isRollingBuild: false
10+
useHelixMonitor: false
1011

1112
jobs:
1213

@@ -42,7 +43,7 @@ jobs:
4243
creator: dotnet-bot
4344
interpreter: true
4445
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
45-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
46+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
4647

4748
#
4849
# iOSSimulator
@@ -76,7 +77,7 @@ jobs:
7677
parameters:
7778
creator: dotnet-bot
7879
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
79-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
80+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
8081
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
8182

8283
#
@@ -113,7 +114,7 @@ jobs:
113114
parameters:
114115
creator: dotnet-bot
115116
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
116-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
117+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
117118
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
118119

119120
#
@@ -157,7 +158,7 @@ jobs:
157158
creator: dotnet-bot
158159
testBuildArgs: /p:DevTeamProvisioning=- /p:UseMonoRuntime=false /p:UseNativeAOTRuntime=false /p:BuildTestsOnHelix=true
159160
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
160-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
161+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
161162
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
162163

163164
#
@@ -193,5 +194,5 @@ jobs:
193194
parameters:
194195
creator: dotnet-bot
195196
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
196-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
197+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
197198
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true

‎eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ parameters:
77
isExtraPlatformsBuild: false
88
isMacCatalystOnlyBuild: false
99
isRollingBuild: false
10+
useHelixMonitor: false
1011

1112
jobs:
1213

@@ -42,7 +43,7 @@ jobs:
4243
parameters:
4344
creator: dotnet-bot
4445
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
45-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
46+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
4647
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
4748

4849
#
@@ -76,7 +77,7 @@ jobs:
7677
parameters:
7778
creator: dotnet-bot
7879
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
79-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
80+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
8081
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
8182

8283
#
@@ -113,7 +114,7 @@ jobs:
113114
parameters:
114115
creator: dotnet-bot
115116
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
116-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
117+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
117118
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
118119

119120
#
@@ -157,7 +158,7 @@ jobs:
157158
creator: dotnet-bot
158159
testBuildArgs: /p:DevTeamProvisioning=- /p:UseMonoRuntime=false /p:UseNativeAOTRuntime=false /p:BuildTestsOnHelix=true
159160
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
160-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
161+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
161162
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
162163

163164
#
@@ -194,7 +195,7 @@ jobs:
194195
parameters:
195196
creator: dotnet-bot
196197
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
197-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
198+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
198199
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true
199200

200201
#
@@ -230,5 +231,5 @@ jobs:
230231
parameters:
231232
creator: dotnet-bot
232233
testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
233-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
234+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
234235
extraHelixArguments: /p:NeedsToBuildAppsOnHelix=true

‎eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
parameters:
66
isExtraPlatformsBuild: ''
7+
useHelixMonitor: false
78

89
jobs:
910

@@ -35,7 +36,7 @@ jobs:
3536
parameters:
3637
creator: dotnet-bot
3738
testRunNamePrefixSuffix: Libraries_Release_CoreCLR
38-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
39+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
3940
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
4041
condition: >-
4142
or(
@@ -60,7 +61,7 @@ jobs:
6061
parameters:
6162
creator: dotnet-bot
6263
testRunNamePrefixSuffix: NET481_$(_BuildConfig)
63-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
64+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
6465
extraHelixArguments: /p:BuildTargetFramework=net481
6566
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
6667
condition: >-
@@ -105,7 +106,7 @@ jobs:
105106
parameters:
106107
creator: dotnet-bot
107108
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
108-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
109+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
109110
condition: >-
110111
or(
111112
eq(variables['librariesContainsChange'], true),
@@ -149,7 +150,7 @@ jobs:
149150
creator: dotnet-bot
150151
llvmAotStepContainer: linux_x64
151152
testRunNamePrefixSuffix: Mono_Release
152-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
153+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
153154
extraVariablesTemplates:
154155
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
155156

@@ -188,7 +189,7 @@ jobs:
188189
parameters:
189190
creator: dotnet-bot
190191
testRunNamePrefixSuffix: Mono_Release
191-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
192+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
192193
extraVariablesTemplates:
193194
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
194195

@@ -226,6 +227,6 @@ jobs:
226227
parameters:
227228
creator: dotnet-bot
228229
testRunNamePrefixSuffix: Mono_Release
229-
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
230+
useHelixMonitor: ${{ parameters.useHelixMonitor }}
230231
extraVariablesTemplates:
231232
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml

0 commit comments

Comments
 (0)