Use same template for MSBuild Smoke tests.

dotnet · Mar 3, 2023 · 01a3fee · 01a3fee
1 parent 5517295
commit 01a3fee
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 158 deletions.
diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
@@ -440,23 +440,23 @@ stages:
 
     - template: yaml-templates/fail-on-issue.yaml
 
-  # Xamarin.Android (Smoke Tests MSBuild - Mac-0)
-  - template: yaml-templates/run-msbuild-mac-tests.yaml
+  # MSBuild Smoke Tests - Mac
+  - template: yaml-templates/run-msbuild-tests.yaml
     parameters:
-      job_name: mac_dotnet_tests_0
-      job_suffix: One .NET
-      nunit_categories: '| (TestCategory = SmokeTests $(DotNetNUnitCategories))'
-      target_framework: $(DotNetStableTargetFramework)
-      provisionatorChannel: ${{ parameters.provisionatorChannel }}
-
-  # Xamarin.Android (Smoke Tests MSBuild - Win-0)
-  - template: yaml-templates\run-msbuild-win-tests.yaml
+      testOS: macOS
+      jobName: mac_smoke_msbuild_tests
+      jobDisplayName: macOS > Tests > MSBuild
+      agentCount: 2
+      testFilter: cat = SmokeTests & cat != DotNetIgnore & cat != HybridAOT & cat != MkBundle & cat != MonoSymbolicate & cat != PackagesConfig & cat != StaticProject & cat != SystemApplication
+
+  # MSBuild Smoke Tests - Win
+  - template: yaml-templates/run-msbuild-tests.yaml
     parameters:
-      job_name: win_dotnet_tests_0
-      job_suffix: One .NET
-      nunit_categories: '| (TestCategory = SmokeTests $(DotNetNUnitCategories))'
-      target_framework: $(DotNetStableTargetFramework)
-      provisionatorChannel: ${{ parameters.provisionatorChannel }}
+      testOS: Windows
+      jobName: win_smoke_msbuild_tests
+      jobDisplayName: Windows > Tests > MSBuild
+      agentCount: 2
+      testFilter: cat = SmokeTests & cat != DotNetIgnore & cat != HybridAOT & cat != MkBundle & cat != MonoSymbolicate & cat != PackagesConfig & cat != StaticProject & cat != SystemApplication
 
   # Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator)"
   - job: mac_msbuilddevice_tests

diff --git a/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml
diff --git a/build-tools/automation/yaml-templates/run-msbuild-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-tests.yaml
@@ -17,8 +17,6 @@ jobs:
       vmImage: $(HostedMacImage)
   timeoutInMinutes: 180
   cancelTimeoutInMinutes: 5
-  variables:
-    androidSdkPlatforms: 33
   steps:
   - ${{ if eq(parameters.testOS, 'Windows') }}:
     - script: netsh int ipv4 set global sourceroutingbehavior=drop

diff --git a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml