From a3e9da4ae4f75457565183af5278b0ff0e1a4807 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Tue, 9 May 2023 13:57:08 -0500
Subject: [PATCH] [ci] Simplify WearOS Emulator test job.

---
 .../stage-msbuild-emulator-tests.yaml         | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
index d1d779aaf88..5d7daf5f370 100644
--- a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
+++ b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
@@ -71,13 +71,13 @@ stages:
     timeoutInMinutes: 180
     cancelTimeoutInMinutes: 2
     strategy:
-      matrix:
-        Android30-x86:
-          avdApiLevel: 30
-          avdAbi: x86
-          avdType: android-wear
-          deviceName: wear_square
-          androidSdkPlatforms: 33
+      parallel: 1
+    variables:
+      avdApiLevel: 30
+      avdAbi: x86
+      avdType: android-wear
+      deviceName: wear_square
+      androidSdkPlatforms: 33
     pool:
       vmImage: $(HostedMacImage)
     workspace:
@@ -85,24 +85,17 @@ stages:
     steps:
     - template: setup-test-environment.yaml
       parameters:
-        configuration: $(XA.Build.Configuration)
+        installTestSlicer: true
         installApkDiff: false
         installLegacyDotNet: false
         restoreNUnitConsole: false
+        updateMono: false
         androidSdkPlatforms: $(androidSdkPlatforms)
         xaSourcePath: ${{ parameters.xaSourcePath }}
         repositoryAlias: ${{ parameters.repositoryAlias }}
         commit: ${{ parameters.commit }}
         xaprepareScenario: EmulatorTestDependencies
 
-    - template: run-xaprepare.yaml
-      parameters:
-        displayName: install required brew tools and prepare java.interop
-        arguments: --s=Required --auto-provision=yes --auto-provision-uses-sudo=yes
-
-    - script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64"
-      displayName: set Java8SdkDirectory
-
     - task: DownloadPipelineArtifact@2
       inputs:
         artifactName: $(TestAssembliesArtifactName)
@@ -116,12 +109,11 @@ stages:
         avdAbi: $(avdAbi)
         avdType: $(avdType)
 
-    - template: run-nunit-tests.yaml
+    - template: run-sliced-nunit-tests.yaml
       parameters:
         testRunTitle: WearOS On Device - macOS
         testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
-        dotNetTestExtraArgs: --filter "TestCategory = WearOS"
-        testResultsFile: TestResult-WearOS--$(XA.Build.Configuration).xml
+        testFilter: cat = WearOS
 
     - ${{ if ne(parameters.usesCleanImages, true) }}:
       - template: start-stop-emulator.yaml
@@ -139,4 +131,3 @@ stages:
         artifactName: Test Results - Emulator $(avdApiLevel)-$(avdAbi)-$(avdType) - macOS
 
     - template: fail-on-issue.yaml
-