Cleanup

Author: rmarinho

eng/pipelines/arcade/stage-device-tests.yml

@@ -20,27 +20,8 @@ parameters:
 - name: runAsPublic
   type: boolean
   default: true
-- name: androidPool
-  type: object
-- name: iosPool
-  type: object
-- name: catalystPool
-  type: object
-- name: windowsPool
-  type: object
-  default: 'dotnet'
-- name: iosVersions
-  type: object
-  default: [ 'latest' ]
-- name: iosDeviceVersions
-  type: object
-  default: [ '15' ]
-- name: androidApiLevels
-  type: object
-  default: [ 33 ]
-- name: catalystVersions
+- name: pool
   type: object
-  default: [ 'latest' ]
 - name: helixProject
   type: string
   default: 'eng/helix_xharness.proj'
@@ -68,7 +49,7 @@ stages:
   - template: ${{ iif(eq(parameters.runAsPublic, 'true'), '/eng/common/templates/jobs/jobs.yml', '/eng/common/templates-official/jobs/jobs.yml@self') }}
     parameters:
       helixRepo: dotnet/maui
-      pool: ${{ parameters.iosPool }}
+      pool: ${{ parameters.pool }}
       enableMicrobuild: true
       enablePublishUsingPipelines: true
       enablePublishBuildAssets: true
@@ -118,8 +99,8 @@ stages:
   - template: ${{ iif(eq(parameters.runAsPublic, 'true'), '/eng/common/templates/jobs/jobs.yml', '/eng/common/templates-official/jobs/jobs.yml@self') }}
     parameters:
       helixRepo: dotnet/maui
-      pool: ${{ parameters.iosPool }}
-      enableMicrobuild: true
+      pool: ${{ parameters.pool }}
+      enableMicrobuild: false
       enablePublishUsingPipelines: true
       enablePublishBuildAssets: true
       enableTelemetry: true
@@ -128,7 +109,7 @@ stages:
       sourceIndexParams: ${{ parameters.sourceIndexParams }}
       publishAssetsImmediately: true
       enablePublishBuildArtifacts: true
-      enablePublishTestResults: true
+      enablePublishTestResults: false
       workspace:
         clean: all
       jobs:

eng/pipelines/device-tests.yml

@@ -63,13 +63,6 @@ parameters:
   type: boolean
   default: false
 
-- name: VM_IMAGE_HOST
-  type: object
-  default:
-    name: NetCore-Public
-    image: 1es-windows-2022
-    os: windows
-
 - name: androidPool
   type: object
   default:
@@ -112,15 +105,13 @@ parameters:
 stages:
 - ${{ each targetFrameworkVersion in parameters.targetFrameworkVersions }}:
 
+  # Run on dnceng-public (Helix)
   - ${{ if eq(variables['Build.DefinitionName'], 'maui-pr-devicetests') }}:
 
+    # Use Helix for iOS / Android and MacCatalyst Device Tests
     - template: /eng/pipelines/arcade/stage-device-tests.yml@self
       parameters:
-        pool: ${{ parameters.VM_IMAGE_HOST }}
-        androidPool: ${{ parameters.androidPool }}
-        iosPool: ${{ parameters.iosPool }}
-        catalystPool: ${{ parameters.catalystPool }}
-        windowsPool: ${{ parameters.windowsPool }}
+        pool: ${{ parameters.iosPool }}
         runAsPublic: true
         prepareSteps:
         - template: /eng/pipelines/common/provision.yml@self
@@ -135,61 +126,28 @@ stages:
             skipProvisioning: true
             skipXcode: true
 
+    # Just use the old way for Windows Device Tests
     - template: common/device-tests.yml
       parameters:
-        androidPool: ${{ parameters.androidPool }}
-        iosPool: ${{ parameters.iosPool }}
-        catalystPool: ${{ parameters.catalystPool }}
         windowsPool: ${{ parameters.windowsPool }}
-        agentPoolAccessToken: $(AgentPoolAccessToken)
         targetFrameworkVersion: ${{ targetFrameworkVersion }}
-        ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
-          androidApiLevels: [ 33, 30, 29, 28, 27, 26, 25, 24, 23 ]
-          iosVersions: [ 'simulator-18.0' ]
-          catalystVersions: [ 'latest' ]
-          windowsVersions: [ 'packaged', 'unpackaged' ]
-          provisionatorChannel: ${{ parameters.provisionatorChannel }}
-          skipProvisioning: ${{ or(not(parameters.UseProvisionator), false) }}
-        ${{ else }}:
-          androidApiLevels: [ 33, 23 ]
-          iosVersions: [ 'simulator-18.0' ]
-          catalystVersions: [ 'latest' ]
-          windowsVersions: [ 'packaged', 'unpackaged' ]
-          provisionatorChannel: ${{ parameters.provisionatorChannel }}
-          skipProvisioning: ${{ not(parameters.UseProvisionator) }}
+        windowsVersions: [ 'packaged', 'unpackaged' ]
+        skipProvisioning: true
         projects:
         - name: essentials
           desc: Essentials
-          androidApiLevelsExclude: [ 25, 27 ] # Ignore for now API25 since the runs's are not stable
-          androidConfiguration: 'Release'
-          iOSConfiguration: 'Debug'
           windowsConfiguration: 'Debug'
           windowsPackageId: 'com.microsoft.maui.essentials.devicetests'
-          android: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
-          ios: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
-          catalyst: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
           windows: $(System.DefaultWorkingDirectory)/src/Essentials/test/DeviceTests/Essentials.DeviceTests.csproj
         - name: graphics
           desc: Graphics
-          androidApiLevelsExclude: [ 25 ] # Ignore for now API25 since the runs's are not stable
-          androidConfiguration: 'Release'
-          iOSConfiguration: 'Debug'
           windowsConfiguration: 'Debug'
           windowsPackageId: 'com.microsoft.maui.graphics.devicetests'
-          android: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
-          ios: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
-          catalyst: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
           windows: $(System.DefaultWorkingDirectory)/src/Graphics/tests/DeviceTests/Graphics.DeviceTests.csproj
         - name: core
           desc: Core
-          androidApiLevelsExclude: [ 25 ] # Ignore for now API25 since the runs's are not stable
-          androidConfiguration: 'Release'
-          iOSConfiguration: 'Debug'
           windowsConfiguration: 'Debug'
           windowsPackageId: 'com.microsoft.maui.core.devicetests'
-          android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
-          ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
-          catalyst: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
           windows: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
         - name: controls
           desc: Controls
@@ -204,18 +162,13 @@ stages:
           windows: $(System.DefaultWorkingDirectory)/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj
         - name: blazorwebview
           desc: BlazorWebView
-          androidApiLevelsExclude: [ 30, 29, 28, 27, 26, 25, 24, 23, 22, 21 ] # BlazorWebView requires a recent version of Chrome
-          androidConfiguration: 'Release'
-          iOSConfiguration: 'Debug'
           windowsConfiguration: 'Debug'
           windowsPackageId: 'Microsoft.Maui.MauiBlazorWebView.DeviceTests'
-          android: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/DeviceTests/MauiBlazorWebView.DeviceTests.csproj
-          ios: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/DeviceTests/MauiBlazorWebView.DeviceTests.csproj
-          catalyst: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/DeviceTests/MauiBlazorWebView.DeviceTests.csproj
           windows: $(System.DefaultWorkingDirectory)/src/BlazorWebView/tests/DeviceTests/MauiBlazorWebView.DeviceTests.csproj
         platforms:
         - windows
 
+  # Run on xamarin public instance
   - ${{ else }}:
 
     - template: common/device-tests.yml