diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index 1bc75d067f8..9eed588b0a4 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -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 @@ -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: diff --git a/build-tools/automation/azure-pipelines-oss.yaml b/build-tools/automation/azure-pipelines-oss.yaml index 7efa8ebbe83..0fbbed4d95f 100644 --- a/build-tools/automation/azure-pipelines-oss.yaml +++ b/build-tools/automation/azure-pipelines-oss.yaml @@ -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: @@ -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 diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 979f6e1b52e..92da1772fc0 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -84,9 +84,9 @@ stages: displayName: Mac dependsOn: [] jobs: - # Check - "Xamarin.Android (Mac Build)" + # Check - "Xamarin.Android (macOS > Build)" - job: mac_build_create_installers - displayName: Build + displayName: macOS > Build pool: name: $(MacBuildPoolName) vmImage: $(MacBuildPoolImage) @@ -145,9 +145,9 @@ stages: displayName: Windows dependsOn: [] jobs: - # Check - "Xamarin.Android (Windows Build and Smoke Test)" + # Check - "Xamarin.Android (Windows > Build & Smoke Test)" - job: win_build_test - displayName: Build and Smoke Test + displayName: Windows > Build & Smoke Test pool: $(1ESWindowsPool) timeoutInMinutes: 360 cancelTimeoutInMinutes: 5 @@ -257,13 +257,13 @@ stages: - template: yaml-templates\fail-on-issue.yaml -# Check - "Xamarin.Android (Linux Build)" +# Check - "Xamarin.Android (Linux > Build)" - stage: linux_build displayName: Linux dependsOn: [] jobs: - job: linux_build_create_sdk_pack - displayName: Build + displayName: Linux > Build pool: android-devdiv-ubuntu-vmss timeoutInMinutes: 180 cancelTimeoutInMinutes: 2 @@ -335,9 +335,9 @@ stages: displayName: Smoke Tests dependsOn: mac_build jobs: - # Check - "Xamarin.Android (Smoke Tests APKs Legacy - macOS)" + # Check - "Xamarin.Android (macOS > Tests > APKs Classic)" - job: mac_apk_tests_legacy - displayName: APKs Legacy - macOS + displayName: macOS > Tests > APKs Classic pool: vmImage: $(HostedMacImage) timeoutInMinutes: 240 @@ -594,9 +594,9 @@ stages: - template: yaml-templates/fail-on-issue.yaml - # Check - "Xamarin.Android (Smoke Tests APKs .NET - macOS)" + # Check - "Xamarin.Android (macOS > Tests > APKs .NET)" - job: mac_apk_tests_net - displayName: APKs .NET - macOS + displayName: macOS > Tests > APKs .NET pool: vmImage: $(HostedMacImage) timeoutInMinutes: 180 @@ -758,9 +758,9 @@ stages: nunit_categories: '|| cat == SmokeTests' provisionatorChannel: ${{ parameters.provisionatorChannel }} - # Check - "Xamarin.Android (Smoke Tests MSBuild Emulator - macOS)" + # Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator)" - job: mac_msbuilddevice_tests - displayName: MSBuild Emulator - macOS + displayName: macOS > Tests > MSBuild+Emulator pool: vmImage: $(HostedMacImage) timeoutInMinutes: 90 @@ -818,9 +818,9 @@ stages: - mac_build - linux_build jobs: - # Check - "Xamarin.Android (Linux Tests MSBuild Smoke)" + # Check - "Xamarin.Android (Linux > Tests > MSBuild)" - job: linux_tests_smoke - displayName: MSBuild Smoke + displayName: Linux > Tests > MSBuild pool: android-devdiv-ubuntu-vmss timeoutInMinutes: 180 workspace: @@ -1032,7 +1032,7 @@ stages: dependsOn: mac_build condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuildDevice'))) jobs: - # Check - "Xamarin.Android (MSBuild Emulator Tests macOS - Legacy)" + # Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator Legacy #N)" - template: yaml-templates/run-msbuild-device-tests.yaml parameters: node_id: 1 @@ -1066,7 +1066,7 @@ stages: nunit_categories: '&& cat == Debugger' provisionatorChannel: ${{ parameters.provisionatorChannel }} - # Check - "Xamarin.Android (MSBuild Emulator Tests macOS - One .NET)" + # Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator One .NET #N)" - template: yaml-templates/run-msbuild-device-tests.yaml parameters: node_id: 1 @@ -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: @@ -1183,10 +1183,10 @@ stages: 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)" + # Check - "Xamarin.Android (macOS > Tests > Designer Integration)" - 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 @@ -1263,9 +1263,9 @@ stages: targetPath: $(Build.ArtifactStagingDirectory)/designer-binlogs condition: ne(variables['Agent.JobStatus'], 'Succeeded') - # Check - "Xamarin.Android (Designer Tests Windows)" + # Check - "Xamarin.Android (Windows > Tests > Designer Integration)" - job: designer_integration_win - displayName: Windows + displayName: Windows > Tests > Designer Integration pool: vmImage: $(HostedWinImage) timeoutInMinutes: 120 @@ -1350,9 +1350,9 @@ stages: dependsOn: mac_build condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'BCL'))) jobs: - # Check - "Xamarin.Android (BCL Emulator Tests macOS)" + # Check - "Xamarin.Android (macOS > Tests > BCL (Emulator))" - job: mac_bcl_tests - displayName: macOS + displayName: macOS > Tests > BCL (Emulator) pool: vmImage: $(HostedMacImage) timeoutInMinutes: 180 diff --git a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml index 10beca6ed94..1bc568b32fb 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml @@ -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 }}" pool: vmImage: $(HostedMacImage) timeoutInMinutes: 90 diff --git a/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml index 68ac06ec6ff..f84b0ac0d44 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml @@ -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 diff --git a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml index cd0d8f2b3f5..a267d415e4f 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml @@ -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