Revert "[CI] Split the sim tests and the macOS tests. (#21215)" (#21247)

This reverts commit e993173.

It breaks CI (tests are still running duplicated, except for the macOS
tests, which aren't running, except on the xcode16 branch, where they're
running and failing).

tools/devops/automation/run-post-ci-build-tests.yml

@@ -13,6 +13,7 @@ resources:
       trigger:
         stages:
           - build_packages
+          - build_macos_tests
 
 extends:
   template: templates/pipelines/run-tests-pipeline.yml

tools/devops/automation/run-post-pr-build-tests.yml

@@ -12,6 +12,7 @@ resources:
       trigger:
         stages:
           - build_packages
+          - build_macos_tests
 
 extends:
   template: templates/pipelines/run-tests-pipeline.yml

tools/devops/automation/templates/pipelines/run-tests-pipeline.yml

@@ -84,6 +84,68 @@ parameters:
         ]
       }]
 
+  - name: macTestsConfigurations
+    displayName: macOS test configurations to run
+    type: object
+    default: [
+      {
+        stageName: 'mac_11_m1',
+        displayName: 'M1 - Mac Big Sur (11)',
+        macPool: 'VSEng-VSMac-Xamarin-Shared',
+        useImage: false,
+        statusContext: 'M1 - Mac Big Sur (11)',
+        demands: [
+          "Agent.OS -equals Darwin",
+          "macOS.Name -equals BigSur",
+          "macOS.Architecture -equals arm64",
+          "Agent.HasDevices -equals False",
+          "Agent.IsPaired -equals False"
+        ]
+      },
+      {
+        stageName: 'mac_12_m1',
+        displayName: 'M1 - Mac Ventura (12)',
+        macPool: 'VSEng-VSMac-Xamarin-Shared',
+        useImage: false,
+        statusContext: 'M1 - Mac Monterey (12)',
+        demands: [
+          "Agent.OS -equals Darwin",
+          "macOS.Name -equals Monterey",
+          "macOS.Architecture -equals arm64",
+          "Agent.HasDevices -equals False",
+          "Agent.IsPaired -equals False"
+        ]
+      },
+      {
+        stageName: 'mac_13_m1',
+        displayName: 'M1 - Mac Ventura (13)',
+        macPool: 'VSEng-VSMac-Xamarin-Shared',
+        useImage: false,
+        statusContext: 'M1 - Mac Ventura (13)',
+        demands: [
+          "Agent.OS -equals Darwin",
+          "macOS.Name -equals Ventura",
+          "macOS.Architecture -equals arm64",
+          "Agent.HasDevices -equals False",
+          "Agent.IsPaired -equals False"
+        ]
+      },
+      {
+        stageName: 'mac_14_x64',
+        displayName: 'X64 - Mac Sonoma (14)',
+        macPool: 'VSEng-Xamarin-RedmondMacBuildPool-iOS-Untrusted',
+        useImage: false,
+        statusContext: 'X64 - Mac Sonoma (14)',
+        demands: [
+          "Agent.OS -equals Darwin",
+          "macOS.Name -equals Sonoma",
+          "macOS.Architecture -equals x64",
+          "Agent.HasDevices -equals False",
+          "Agent.IsPaired -equals False"
+        ]
+      }]
+
+
 resources:
   repositories:
     - repository: self
@@ -127,9 +189,11 @@ stages:
       pool: ${{ parameters.pool }}
       runTests: ${{ parameters.runTests }}
       runDeviceTests: ${{ parameters.runDeviceTests }}
+      runOldMacOSTests: ${{ parameters.runOldMacOSTests }}
       runWindowsIntegration: ${{ parameters.runWindowsIntegration }}
       runSamples: ${{ parameters.runSamples }}
       ${{ if ne(length(parameters.testConfigurations), 0)}}:
         testConfigurations: ${{ parameters.testConfigurations }}
       deviceTestsConfigurations: ${{ parameters.deviceTestsConfigurations }}
+      macTestsConfigurations: ${{ parameters.macTestsConfigurations }}
 

tools/devops/automation/templates/tests-stage.yml

@@ -20,6 +20,10 @@ parameters:
   type: boolean
   default: false
 
+- name: runOldMacOSTests
+  type: boolean
+  default: true
+
 - name: runWindowsIntegration
   type: boolean
   default: true
@@ -153,6 +157,9 @@ parameters:
 - name: deviceTestsConfigurations
   type: object
 
+- name: macTestsConfigurations
+  type: object
+
 - name: stageDisplayNamePrefix
   type: string
   default: ''
@@ -258,6 +265,22 @@ stages:
     commit: ${{ parameters.commit }}
     postPipeline: true
 
+- ${{ if eq(parameters.runOldMacOSTests, true) }}:
+  - ${{ each config in parameters.macTestsConfigurations }}:
+    - template: ./mac/stage.yml
+      parameters:
+        isPR: ${{ parameters.isPR }}
+        repositoryAlias: ${{ parameters.repositoryAlias }}
+        commit: ${{ parameters.commit }}
+        stageName: ${{ config.stageName }}
+        displayName: ' ${{ parameters.stageDisplayNamePrefix }}${{ config.displayName }}'
+        macPool: ${{ config.macPool }}
+        useImage: ${{ config.useImage }}
+        statusContext: ${{ config.statusContext }}
+        keyringPass: $(pass--lab--mac--builder--keychain)
+        demands: ${{ config.demands }}
+        postPipeline: true
+
 - ${{ if eq(parameters.runWindowsIntegration, true) }}:
   - template: ./windows/stage.yml
     parameters: