Skip to content

[ci] Rename job names #7186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 2 commits into from
Jul 21, 2022
Merged

[ci] Rename job names #7186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f41efa5
[ci] Rename job names
jonpryor Jul 20, 2022
2d9f636
[ci] Rename job names
jonpryor Jul 20, 2022
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
4 changes: 2 additions & 2 deletions build-tools/automation/azure-pipelines-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stages:
dependsOn: []
jobs:
- job: mac_build_create_installers
displayName: macOS
displayName: macOS > Create Installers
pool:
name: VSEng-Xamarin-RedmondMac-Android-Untrusted
demands: macOS.Name -equals Monterey
Expand Down Expand Up @@ -65,7 +65,7 @@ stages:
- group: xamops-azdev-secrets
jobs:
- job: emulator_tests
displayName: Emulator
displayName: macOS > Tests > APKs (Emulator)
timeoutInMinutes: 180
cancelTimeoutInMinutes: 2
strategy:
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/azure-pipelines-oss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ stages:
condition: eq(variables['EnableMacStage'], 'true') # The variable is defined on the pipeline definition
jobs:
- job: mac_build
displayName: Mac Build
displayName: macOS > Build
pool:
name: VSEng-Xamarin-RedmondMac-Android-OSS
demands:
Expand Down Expand Up @@ -148,7 +148,7 @@ stages:
dependsOn: [] # Run stage in parallel
jobs:
- job: linux_build_package
displayName: Linux Build
displayName: Linux > Build
pool: android-public-ubuntu-vmss
timeoutInMinutes: 180
cancelTimeoutInMinutes: 5
Expand Down
32 changes: 16 additions & 16 deletions build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ variables:
# Stage and Job "display names" are shortened because they are combined to form the name of the corresponding GitHub check.
stages:
- stage: mac_build
displayName: Mac
displayName: macOS Build
dependsOn: []
jobs:
# Check - "Xamarin.Android (Mac Build)"
- job: mac_build_create_installers
displayName: Build
displayName: macOS > Build
pool:
name: $(MacBuildPoolName)
vmImage: $(MacBuildPoolImage)
Expand Down Expand Up @@ -142,12 +142,12 @@ stages:

# This stage ensures Windows specific build steps continue to work, and runs unit tests.
- stage: win_build_test
displayName: Windows
displayName: Windows Build & Smoke Test
dependsOn: []
jobs:
# Check - "Xamarin.Android (Windows Build and Smoke Test)"
- job: win_build_test
displayName: Build and Smoke Test
displayName: Windows > Build & Smoke Test
pool: $(1ESWindowsPool)
timeoutInMinutes: 360
cancelTimeoutInMinutes: 5
Expand Down Expand Up @@ -259,11 +259,11 @@ stages:

# Check - "Xamarin.Android (Linux Build)"
- stage: linux_build
displayName: Linux
displayName: Linux Build
dependsOn: []
jobs:
- job: linux_build_create_sdk_pack
displayName: Build
displayName: Linux > Build
pool: android-devdiv-ubuntu-vmss
timeoutInMinutes: 180
cancelTimeoutInMinutes: 2
Expand Down Expand Up @@ -332,12 +332,12 @@ stages:
- template: yaml-templates/fail-on-issue.yaml

- stage: smoke_tests
displayName: Smoke Tests
displayName: macOS > Smoke Tests
Copy link
Member

@pjcollins pjcollins Jul 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to reduce the verbosity in the GitHub checks that get reported back to the repo, maybe we should keep the stage names mostly unchanged and as simple as possible, while making job names more verbose.

The rename of the Smoke Tests stage to macOS > Smoke Tests is a bit odd, as the smoke test stage contains a job that runs on windows. Unless part of the intent behind the rename was to include stage dependencies in the name?

I would suggest something like this instead (leaving stage display names mostly unchanged):

Stage: Smoke Tests
Job: macOS > Tests > APKs Classic
Resulting GitHub status: Xamarin.Android-PR (Smoke Tests macOS > Tests > Apks Classic

We could also continue to use macOS, Windows, and Linux as stage names for the earlier build stages.

Copy link
Contributor Author

@jonpryor jonpryor Jul 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've reverted the - stage > displayName changes, so the historical stage names should be used once more.

I also quoted displayName values which contain #, as the "alt/hover text" for those entries were rendered as … \# …, which was not the intent.

Copy link
Member

@pjcollins pjcollins Jul 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me, I think we may still end up with some "clunky" names but that's a fair trade off for better traceability.

dependsOn: mac_build
jobs:
# Check - "Xamarin.Android (Smoke Tests APKs Legacy - macOS)"
- job: mac_apk_tests_legacy
displayName: APKs Legacy - macOS
displayName: macOS > Tests > APKs Classic
pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 240
Expand Down Expand Up @@ -596,7 +596,7 @@ stages:

# Check - "Xamarin.Android (Smoke Tests APKs .NET - macOS)"
- job: mac_apk_tests_net
displayName: APKs .NET - macOS
displayName: macOS > Tests > APKs .NET
pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 180
Expand Down Expand Up @@ -760,7 +760,7 @@ stages:

# Check - "Xamarin.Android (Smoke Tests MSBuild Emulator - macOS)"
- job: mac_msbuilddevice_tests
displayName: MSBuild Emulator - macOS
displayName: macOS > Tests > MSBuild+Emulator
pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 90
Expand Down Expand Up @@ -820,7 +820,7 @@ stages:
jobs:
# Check - "Xamarin.Android (Linux Tests MSBuild Smoke)"
- job: linux_tests_smoke
displayName: MSBuild Smoke
displayName: Linux > Tests > MSBuild
pool: android-devdiv-ubuntu-vmss
timeoutInMinutes: 180
workspace:
Expand Down Expand Up @@ -1109,7 +1109,7 @@ stages:
condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuildDevice')))
jobs:
- job: wear_tests
displayName: wear_tests
displayName: macOS > Tests > WearOS
timeoutInMinutes: 180
cancelTimeoutInMinutes: 2
strategy:
Expand Down Expand Up @@ -1179,14 +1179,14 @@ stages:


- stage: designer_tests
displayName: Designer Tests
displayName: Designer Integration Tests
dependsOn: mac_build
condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'Designer')))
jobs:
# Check - "Xamarin.Android (Designer Tests macOS)"
- job: designer_integration_mac
condition: false #TODO: Enable once test issues are fixed.
displayName: macOS
displayName: macOS > Tests > Designer Integration
pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 120
Expand Down Expand Up @@ -1265,7 +1265,7 @@ stages:

# Check - "Xamarin.Android (Designer Tests Windows)"
- job: designer_integration_win
displayName: Windows
displayName: Windows > Tests > Designer Integration
pool:
vmImage: $(HostedWinImage)
timeoutInMinutes: 120
Expand Down Expand Up @@ -1352,7 +1352,7 @@ stages:
jobs:
# Check - "Xamarin.Android (BCL Emulator Tests macOS)"
- job: mac_bcl_tests
displayName: macOS
displayName: macOS > Tests > BCL (Emulator)
pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 180
Expand Down
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:

jobs:
- job: ${{ parameters.job_name }}
displayName: MSBuild With Emulator - macOS-${{ parameters.node_id }} - ${{ parameters.job_suffix }}
displayName: macOS > Tests > MSBuild+Emulator ${{ parameters.job_suffix }} \#${{ parameters.node_id }}
Copy link
Contributor Author

@jonpryor jonpryor Jul 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤣 , the \ appears in the "alt/hover text" in AzDO.

I'll need to try quoting the line to allow # in there.

pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 90
Expand Down
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ parameters:

jobs:
- job: ${{ parameters.job_name }}
displayName: MSBuild ${{ parameters.job_suffix }} - macOS-${{ parameters.node_id }}
displayName: macOS > Tests > MSBuild ${{ parameters.job_suffix }} \#${{ parameters.node_id }}
pool:
vmImage: $(HostedMacImage)
timeoutInMinutes: 180
Expand Down
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:

jobs:
- job: ${{ parameters.job_name }}
displayName: MSBuild ${{ parameters.job_suffix }} - Windows-${{ parameters.node_id }}/${{ parameters.additional_node_id }}
displayName: Windows > Tests > MSBuild ${{ parameters.job_suffix }} \#${{ parameters.node_id }}/${{ parameters.additional_node_id }}
pool: $(1ESWindowsPool)
timeoutInMinutes: 180
cancelTimeoutInMinutes: 5
Expand Down