Move WearOS job to new stage template.

build-tools/automation/azure-pipelines.yaml

@@ -659,74 +659,6 @@ stages:
  stageCondition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuildDevice')))
  nunit_categories: '& cat != DotNetIgnore & cat != HybridAOT & cat != MkBundle & cat != MonoSymbolicate & cat != PackagesConfig & cat != StaticProject & cat != SystemApplication'
 
- - job: wear_tests
- displayName: macOS > Tests > WearOS 
- timeoutInMinutes: 180
- cancelTimeoutInMinutes: 2
- strategy:
- matrix:
- Android30-x86:
- avdApiLevel: 30
- avdAbi: x86
- avdType: android-wear
- deviceName: wear_square
- pool:
- vmImage: $(HostedMacImage)
- workspace:
- clean: all
- steps:
- - template: yaml-templates/setup-test-environment.yaml
- parameters:
- configuration: $(XA.Build.Configuration)
-
- - template: yaml-templates/run-xaprepare.yaml
- parameters:
- displayName: install required brew tools and prepare java.interop
- arguments: --s=Required --auto-provision=yes --auto-provision-uses-sudo=yes
-
- - template: yaml-templates/run-xaprepare.yaml
- parameters:
- displayName: install emulator
- arguments: --s=EmulatorTestDependencies
-
- - script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64"
- displayName: set Java8SdkDirectory
-
- - task: DownloadPipelineArtifact@2
- inputs:
- artifactName: $(TestAssembliesArtifactName)
- downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)
-
- - task: MSBuild@1
- displayName: install and launch emulator
- inputs:
- solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
- configuration: $(XA.Build.Configuration)
- msbuildArguments: /t:InstallAvdImage;AcquireAndroidTarget /p:TestDeviceName=$(deviceName) /p:TestAvdApiLevel=$(avdApiLevel) /p:TestAvdAbi=$(avdAbi) /p:TestAvdType=$(avdType) /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/install-emulator-$(avdApiLevel).binlog
-
- - template: yaml-templates/run-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
-
- - task: MSBuild@1
- displayName: shut down emulator
- inputs:
- solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
- configuration: $(XA.Build.Configuration)
- msbuildArguments: /t:AcquireAndroidTarget,ReleaseAndroidTarget /p:TestDeviceName=$(deviceName) /p:TestAvdApiLevel=$(avdApiLevel) /p:TestAvdAbi=$(avdAbi) /p:TestAvdType=$(avdType) /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
- condition: always()
-
- - template: yaml-templates/upload-results.yaml
- parameters:
- configuration: $(XA.Build.Configuration)
- artifactName: Test Results - Emulator $(avdApiLevel)-$(avdAbi)-$(avdType) - macOS
-
- - template: yaml-templates/fail-on-issue.yaml
-
-
 - stage: bcl_tests
  displayName: BCL Emulator Tests
  dependsOn: mac_build

build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml

@@ -82,3 +82,72 @@ stages:
  artifactName: Test Results - MSBuild With Emulator - macOS-$(System.JobPositionInPhase)
 
  - template: fail-on-issue.yaml
+
+ - job: wear_tests
+ displayName: macOS > Tests > WearOS 
+ timeoutInMinutes: 180
+ cancelTimeoutInMinutes: 2
+ strategy:
+ matrix:
+ Android30-x86:
+ avdApiLevel: 30
+ avdAbi: x86
+ avdType: android-wear
+ deviceName: wear_square
+ pool:
+ vmImage: $(HostedMacImage)
+ workspace:
+ clean: all
+ steps:
+ - template: setup-test-environment.yaml
+ parameters:
+ configuration: $(XA.Build.Configuration)
+
+ - 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
+
+ - template: run-xaprepare.yaml
+ parameters:
+ displayName: install emulator
+ arguments: --s=EmulatorTestDependencies
+
+ - script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64"
+ displayName: set Java8SdkDirectory
+
+ - task: DownloadPipelineArtifact@2
+ inputs:
+ artifactName: $(TestAssembliesArtifactName)
+ downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)
+
+ - task: MSBuild@1
+ displayName: install and launch emulator
+ inputs:
+ solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
+ configuration: $(XA.Build.Configuration)
+ msbuildArguments: /t:InstallAvdImage;AcquireAndroidTarget /p:TestDeviceName=$(deviceName) /p:TestAvdApiLevel=$(avdApiLevel) /p:TestAvdAbi=$(avdAbi) /p:TestAvdType=$(avdType) /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/install-emulator-$(avdApiLevel).binlog
+
+ - template: run-nunit-tests.yaml
+ parameters:
+ useDotNet: true
+ 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
+
+ - task: MSBuild@1
+ displayName: shut down emulator
+ inputs:
+ solution: tests/Mono.Android-Tests/Mono.Android-Tests.csproj
+ configuration: $(XA.Build.Configuration)
+ msbuildArguments: /t:AcquireAndroidTarget,ReleaseAndroidTarget /p:TestDeviceName=$(deviceName) /p:TestAvdApiLevel=$(avdApiLevel) /p:TestAvdAbi=$(avdAbi) /p:TestAvdType=$(avdType) /bl:$(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/shutdown-emulator.binlog
+ condition: always()
+
+ - template: upload-results.yaml
+ parameters:
+ configuration: $(XA.Build.Configuration)
+ artifactName: Test Results - Emulator $(avdApiLevel)-$(avdAbi)-$(avdType) - macOS
+
+ - template: fail-on-issue.yaml
+