Skip to content

Commit 3781fc1

Browse files
authored
[ci] Rename job names (#7186)
Certain tools such as [Component Governance][0] only use the Pipeline name -- as defined somewhere in Azure DevOps -- and the `displayName` property on the [`job` definition][1]. The `displayName` property on the containing [`stage` definition][2] is *not* displayed. This can result in "wonderful" alerts which state that the affected pipeline is e.g. `Xamarin.Android (macOS)`, which isn't particularly helpful when there are *three* jobs with a `displayName` of `macOS`: * `designer_integration_mac` * `mac_bcl_tests` * `mac_build_create_installers` Fully understanding these alerts is irksome. Improve this situation by introducing "redundancy" into the job `displayName` values, and updating them to follow a pattern: 1. Host Platform 2. Category 3. (Optional) Description Each part is separated from the others by a ` > `. Examples: * Replace `Mac Build` with `macOS > Build`. * For the previous `macOS` displayName values: * The `designer_integration_mac` job is `macOS > Tests > Designer Integration` * The `mac_bcl_tests` job is `macOS > Tests > BCL (Emulator)` * The `mac_build_create_installers` job is `macOS > Create Installers` * Replace `Build and Smoke Test` with `Windows > Build & Smoke Test` [0]: https://devdiv.visualstudio.com/DevDiv/_componentGovernance/112013?_a=alerts&typeId=6317076&alerts-view-option=active [1]: https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema/jobs-job?view=azure-pipelines [2]: https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema/stages-stage?view=azure-pipelines
1 parent 29ea53a commit 3781fc1

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

build-tools/automation/azure-pipelines-nightly.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ stages:
3131
dependsOn: []
3232
jobs:
3333
- job: mac_build_create_installers
34-
displayName: macOS
34+
displayName: macOS > Create Installers
3535
pool:
3636
name: VSEng-Xamarin-RedmondMac-Android-Untrusted
3737
demands: macOS.Name -equals Monterey
@@ -65,7 +65,7 @@ stages:
6565
- group: xamops-azdev-secrets
6666
jobs:
6767
- job: emulator_tests
68-
displayName: Emulator
68+
displayName: macOS > Tests > APKs (Emulator)
6969
timeoutInMinutes: 180
7070
cancelTimeoutInMinutes: 2
7171
strategy:

build-tools/automation/azure-pipelines-oss.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ stages:
3131
condition: eq(variables['EnableMacStage'], 'true') # The variable is defined on the pipeline definition
3232
jobs:
3333
- job: mac_build
34-
displayName: Mac Build
34+
displayName: macOS > Build
3535
pool:
3636
name: VSEng-Xamarin-RedmondMac-Android-OSS
3737
demands:
@@ -148,7 +148,7 @@ stages:
148148
dependsOn: [] # Run stage in parallel
149149
jobs:
150150
- job: linux_build_package
151-
displayName: Linux Build
151+
displayName: Linux > Build
152152
pool: android-public-ubuntu-vmss
153153
timeoutInMinutes: 180
154154
cancelTimeoutInMinutes: 5

build-tools/automation/azure-pipelines.yaml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ stages:
8484
displayName: Mac
8585
dependsOn: []
8686
jobs:
87-
# Check - "Xamarin.Android (Mac Build)"
87+
# Check - "Xamarin.Android (macOS > Build)"
8888
- job: mac_build_create_installers
89-
displayName: Build
89+
displayName: macOS > Build
9090
pool:
9191
name: $(MacBuildPoolName)
9292
vmImage: $(MacBuildPoolImage)
@@ -145,9 +145,9 @@ stages:
145145
displayName: Windows
146146
dependsOn: []
147147
jobs:
148-
# Check - "Xamarin.Android (Windows Build and Smoke Test)"
148+
# Check - "Xamarin.Android (Windows > Build & Smoke Test)"
149149
- job: win_build_test
150-
displayName: Build and Smoke Test
150+
displayName: Windows > Build & Smoke Test
151151
pool: $(1ESWindowsPool)
152152
timeoutInMinutes: 360
153153
cancelTimeoutInMinutes: 5
@@ -257,13 +257,13 @@ stages:
257257

258258
- template: yaml-templates\fail-on-issue.yaml
259259

260-
# Check - "Xamarin.Android (Linux Build)"
260+
# Check - "Xamarin.Android (Linux > Build)"
261261
- stage: linux_build
262262
displayName: Linux
263263
dependsOn: []
264264
jobs:
265265
- job: linux_build_create_sdk_pack
266-
displayName: Build
266+
displayName: Linux > Build
267267
pool: android-devdiv-ubuntu-vmss
268268
timeoutInMinutes: 180
269269
cancelTimeoutInMinutes: 2
@@ -335,9 +335,9 @@ stages:
335335
displayName: Smoke Tests
336336
dependsOn: mac_build
337337
jobs:
338-
# Check - "Xamarin.Android (Smoke Tests APKs Legacy - macOS)"
338+
# Check - "Xamarin.Android (macOS > Tests > APKs Classic)"
339339
- job: mac_apk_tests_legacy
340-
displayName: APKs Legacy - macOS
340+
displayName: macOS > Tests > APKs Classic
341341
pool:
342342
vmImage: $(HostedMacImage)
343343
timeoutInMinutes: 240
@@ -594,9 +594,9 @@ stages:
594594

595595
- template: yaml-templates/fail-on-issue.yaml
596596

597-
# Check - "Xamarin.Android (Smoke Tests APKs .NET - macOS)"
597+
# Check - "Xamarin.Android (macOS > Tests > APKs .NET)"
598598
- job: mac_apk_tests_net
599-
displayName: APKs .NET - macOS
599+
displayName: macOS > Tests > APKs .NET
600600
pool:
601601
vmImage: $(HostedMacImage)
602602
timeoutInMinutes: 180
@@ -758,9 +758,9 @@ stages:
758758
nunit_categories: '|| cat == SmokeTests'
759759
provisionatorChannel: ${{ parameters.provisionatorChannel }}
760760

761-
# Check - "Xamarin.Android (Smoke Tests MSBuild Emulator - macOS)"
761+
# Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator)"
762762
- job: mac_msbuilddevice_tests
763-
displayName: MSBuild Emulator - macOS
763+
displayName: macOS > Tests > MSBuild+Emulator
764764
pool:
765765
vmImage: $(HostedMacImage)
766766
timeoutInMinutes: 90
@@ -818,9 +818,9 @@ stages:
818818
- mac_build
819819
- linux_build
820820
jobs:
821-
# Check - "Xamarin.Android (Linux Tests MSBuild Smoke)"
821+
# Check - "Xamarin.Android (Linux > Tests > MSBuild)"
822822
- job: linux_tests_smoke
823-
displayName: MSBuild Smoke
823+
displayName: Linux > Tests > MSBuild
824824
pool: android-devdiv-ubuntu-vmss
825825
timeoutInMinutes: 180
826826
workspace:
@@ -1032,7 +1032,7 @@ stages:
10321032
dependsOn: mac_build
10331033
condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuildDevice')))
10341034
jobs:
1035-
# Check - "Xamarin.Android (MSBuild Emulator Tests macOS - Legacy)"
1035+
# Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator Legacy #N)"
10361036
- template: yaml-templates/run-msbuild-device-tests.yaml
10371037
parameters:
10381038
node_id: 1
@@ -1066,7 +1066,7 @@ stages:
10661066
nunit_categories: '&& cat == Debugger'
10671067
provisionatorChannel: ${{ parameters.provisionatorChannel }}
10681068

1069-
# Check - "Xamarin.Android (MSBuild Emulator Tests macOS - One .NET)"
1069+
# Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator One .NET #N)"
10701070
- template: yaml-templates/run-msbuild-device-tests.yaml
10711071
parameters:
10721072
node_id: 1
@@ -1109,7 +1109,7 @@ stages:
11091109
condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuildDevice')))
11101110
jobs:
11111111
- job: wear_tests
1112-
displayName: wear_tests
1112+
displayName: macOS > Tests > WearOS
11131113
timeoutInMinutes: 180
11141114
cancelTimeoutInMinutes: 2
11151115
strategy:
@@ -1183,10 +1183,10 @@ stages:
11831183
dependsOn: mac_build
11841184
condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'Designer')))
11851185
jobs:
1186-
# Check - "Xamarin.Android (Designer Tests macOS)"
1186+
# Check - "Xamarin.Android (macOS > Tests > Designer Integration)"
11871187
- job: designer_integration_mac
11881188
condition: false #TODO: Enable once test issues are fixed.
1189-
displayName: macOS
1189+
displayName: macOS > Tests > Designer Integration
11901190
pool:
11911191
vmImage: $(HostedMacImage)
11921192
timeoutInMinutes: 120
@@ -1263,9 +1263,9 @@ stages:
12631263
targetPath: $(Build.ArtifactStagingDirectory)/designer-binlogs
12641264
condition: ne(variables['Agent.JobStatus'], 'Succeeded')
12651265

1266-
# Check - "Xamarin.Android (Designer Tests Windows)"
1266+
# Check - "Xamarin.Android (Windows > Tests > Designer Integration)"
12671267
- job: designer_integration_win
1268-
displayName: Windows
1268+
displayName: Windows > Tests > Designer Integration
12691269
pool:
12701270
vmImage: $(HostedWinImage)
12711271
timeoutInMinutes: 120
@@ -1350,9 +1350,9 @@ stages:
13501350
dependsOn: mac_build
13511351
condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'BCL')))
13521352
jobs:
1353-
# Check - "Xamarin.Android (BCL Emulator Tests macOS)"
1353+
# Check - "Xamarin.Android (macOS > Tests > BCL (Emulator))"
13541354
- job: mac_bcl_tests
1355-
displayName: macOS
1355+
displayName: macOS > Tests > BCL (Emulator)
13561356
pool:
13571357
vmImage: $(HostedMacImage)
13581358
timeoutInMinutes: 180

build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parameters:
1111

1212
jobs:
1313
- job: ${{ parameters.job_name }}
14-
displayName: MSBuild With Emulator - macOS-${{ parameters.node_id }} - ${{ parameters.job_suffix }}
14+
displayName: "macOS > Tests > MSBuild+Emulator ${{ parameters.job_suffix }} #${{ parameters.node_id }}"
1515
pool:
1616
vmImage: $(HostedMacImage)
1717
timeoutInMinutes: 90

build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ parameters:
1212

1313
jobs:
1414
- job: ${{ parameters.job_name }}
15-
displayName: MSBuild ${{ parameters.job_suffix }} - macOS-${{ parameters.node_id }}
15+
displayName: "macOS > Tests > MSBuild ${{ parameters.job_suffix }} #${{ parameters.node_id }}"
1616
pool:
1717
vmImage: $(HostedMacImage)
1818
timeoutInMinutes: 180

build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ parameters:
1313

1414
jobs:
1515
- job: ${{ parameters.job_name }}
16-
displayName: MSBuild ${{ parameters.job_suffix }} - Windows-${{ parameters.node_id }}/${{ parameters.additional_node_id }}
16+
displayName: "Windows > Tests > MSBuild ${{ parameters.job_suffix }} #${{ parameters.node_id }}/${{ parameters.additional_node_id }}"
1717
pool: $(1ESWindowsPool)
1818
timeoutInMinutes: 180
1919
cancelTimeoutInMinutes: 5

0 commit comments

Comments
 (0)