﻿Switch to 6 agents.

jpobst · jpobst · commit cd228bb31087 · 2023-02-27T11:29:14.000-10:00
diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml
@@ -7,6 +7,7 @@ parameters:
   updateVS: false
   jdkTestFolder: $(JAVA_HOME_11_X64)
   remove_dotnet: false
+  installTestSlicer: false
 
 steps:
 - checkout: self
@@ -102,4 +103,5 @@ steps:
 
 - template: install-apkdiff.yaml
 
-- template: install-dotnet-test-slicer.yaml
+- ${{ if eq(parameters.installTestSlicer, true) }}:
+  - template: install-dotnet-test-slicer.yaml
diff --git a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
@@ -2,6 +2,7 @@
 
 parameters:
   job_name: 'mac_dotnetdevice_tests'
+  agent_count: 6
   nunit_categories: $(DotNetNUnitCategories)
   target_framework: $(DotNetStableTargetFramework)
   provisionatorChannel: latest
@@ -16,8 +17,8 @@ stages:
   jobs:
   - job: ${{ parameters.job_name }}
     strategy:
-      parallel: 4
-    displayName: "macOS > Tests > MSBuild+Emulator $(System.JobPositionInPhase)"
+      parallel: ${{ parameters.agent_count }}
+    displayName: "macOS > Tests > MSBuild+Emulator"
     condition: ${{ parameters.jobCondition }}
     pool:
       vmImage: $(HostedMacImage)
@@ -30,6 +31,7 @@ stages:
       parameters:
         provisionClassic: false
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
+        installTestSlicer: true
 
     - template: run-xaprepare.yaml
       parameters:
diff --git a/tests/MSBuildDeviceIntegration/Tests/AotProfileTests.cs b/tests/MSBuildDeviceIntegration/Tests/AotProfileTests.cs
@@ -6,7 +6,7 @@
 
 namespace Xamarin.Android.Build.Tests
 {
-	[Category ("UsesDevice"), Category ("AOT"), Category ("ProfiledAOT"), Category ("Node-3")]
+	[Category ("UsesDevice"), Category ("AOT"), Category ("ProfiledAOT")]
 	public class AotProfileTests : DeviceTest
 	{
 
diff --git a/tests/MSBuildDeviceIntegration/Tests/BundleToolTests.cs b/tests/MSBuildDeviceIntegration/Tests/BundleToolTests.cs
@@ -11,7 +11,7 @@ namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
 	[TestFixtureSource(nameof(FixtureArgs))]
-	[Category ("Node-1"), Category ("XamarinBuildDownload")]
+	[Category ("XamarinBuildDownload")]
 	public class BundleToolTests : DeviceTest
 	{
 		static readonly object[] FixtureArgs = {
diff --git a/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs b/tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs
@@ -46,7 +46,6 @@ int FindTextInFile (string file, string text)
 		}
 
 		[Test]
-		[Category ("Node-3")]
 		public void ApplicationRunsWithoutDebugger ([Values (false, true)] bool isRelease, [Values (false, true)] bool extractNativeLibs, [Values (false, true)] bool useEmbeddedDex)
 		{
 			AssertHasDevices ();
@@ -84,7 +83,6 @@ public void ApplicationRunsWithoutDebugger ([Values (false, true)] bool isReleas
 		}
 
 		[Test]
-		[Category ("Node-3")]
 		public void ClassLibraryMainLauncherRuns ([Values (true, false)] bool preloadAssemblies)
 		{
 			AssertHasDevices ();
@@ -169,7 +167,7 @@ public void ClassLibraryMainLauncherRuns ([Values (true, false)] bool preloadAss
 		};
 #pragma warning restore 414
 
-		[Test, Category ("Debugger"), Category ("Node-4")]
+		[Test, Category ("Debugger")]
 		[TestCaseSource (nameof (DebuggerCustomAppTestCases))]
 		[Retry(5)]
 		public void CustomApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string fastDevType, bool activityStarts)
@@ -347,7 +345,7 @@ public override void OnCreate ()
 		};
 #pragma warning restore 414
 
-		[Test, Category ("SmokeTests"), Category ("Debugger"), Category ("Node-4")]
+		[Test, Category ("SmokeTests"), Category ("Debugger")]
 		[TestCaseSource (nameof(DebuggerTestCases))]
 		[Retry (5)]
 		public void ApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string fastDevType, bool allowDeltaInstall, string username, string debugType)
diff --git a/tests/MSBuildDeviceIntegration/Tests/DeleteBinObjTest.cs b/tests/MSBuildDeviceIntegration/Tests/DeleteBinObjTest.cs
@@ -6,7 +6,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("DotNetIgnore"), Category ("Node-1")] // .csproj files are legacy projects that won't build under dotnet
+	[Category ("DotNetIgnore")] // .csproj files are legacy projects that won't build under dotnet
 	public class DeleteBinObjTest : DeviceTest
 	{
 		const string BaseUrl = "https://github.com/dellis1972/xamarin-android-unittest-files/blob/main/";
diff --git a/tests/MSBuildDeviceIntegration/Tests/DeploymentTest.cs b/tests/MSBuildDeviceIntegration/Tests/DeploymentTest.cs
@@ -20,7 +20,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("UsesDevice"), Category ("Node-2")]
+	[Category ("UsesDevice")]
 	[NonParallelizable]
 	public class DeploymentTest : DeviceTest {
 
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -8,7 +8,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("UsesDevice"), Category ("Node-2")]
+	[Category ("UsesDevice")]
 	public class InstallAndRunTests : DeviceTest
 	{
 		static ProjectBuilder builder;
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallTests.cs
@@ -12,7 +12,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("Commercial"), Category ("UsesDevice"), Category ("Node-1")]
+	[Category ("Commercial"), Category ("UsesDevice")]
 	public class InstallTests : DeviceTest
 	{
 		string GetContentFromAllOverrideDirectories (string packageName, bool useRunAsCommand = true)
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstantRunTest.cs b/tests/MSBuildDeviceIntegration/Tests/InstantRunTest.cs
@@ -7,7 +7,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("Commercial"), Category ("UsesDevice"), Category ("Node-3")]
+	[Category ("Commercial"), Category ("UsesDevice")]
 	public class InstantRunTest : DeviceTest
 	{
 		[Test]
diff --git a/tests/MSBuildDeviceIntegration/Tests/MonoAndroidExportTest.cs b/tests/MSBuildDeviceIntegration/Tests/MonoAndroidExportTest.cs
@@ -12,7 +12,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("UsesDevice"), Category ("Node-1")]
+	[Category ("UsesDevice")]
 	public class MonoAndroidExportTest : DeviceTest {
 #pragma warning disable 414
 		static object [] MonoAndroidExportTestCases = new object [] {
diff --git a/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs b/tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs
@@ -11,7 +11,6 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("Node-2")]
 	public class PerformanceTest : DeviceTest
 	{
 		const int Retry = 2;
diff --git a/tests/MSBuildDeviceIntegration/Tests/SystemApplicationTests.cs b/tests/MSBuildDeviceIntegration/Tests/SystemApplicationTests.cs
@@ -11,7 +11,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("Commercial"), Category ("UsesDevice"), Category ("Node-1")]
+	[Category ("Commercial"), Category ("UsesDevice")]
 	public class SystemApplicationTests : DeviceTest
 	{
 		// All Tests here require the emulator to be started with -writable-system
diff --git a/tests/MSBuildDeviceIntegration/Tests/UncaughtExceptionTests.cs b/tests/MSBuildDeviceIntegration/Tests/UncaughtExceptionTests.cs
@@ -8,7 +8,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("UsesDevice"), Category ("Node-3")]
+	[Category ("UsesDevice")]
 	public class UncaughtExceptionTests : DeviceTest
 	{
 		class LogcatLine
diff --git a/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs b/tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs
@@ -16,7 +16,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("UsesDevice"), Category ("SmokeTests"), Category ("WearOS"), Category ("Node-3")]
+	[Category ("UsesDevice"), Category ("SmokeTests"), Category ("WearOS")]
 	public class XASdkDeployTests : DeviceTest
 	{
 		static object [] DotNetInstallAndRunSource = new object [] {
@@ -209,7 +209,7 @@ public void SupportDesugaringStaticInterfaceMethods ()
 		}
 
 		[Test]
-		[Category ("Debugger"), Category ("Node-4")]
+		[Category ("Debugger")]
 		public void DotNetDebug ([Values("net6.0-android", "net7.0-android")] string targetFramework)
 		{
 			AssertCommercialBuild ();

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Xamarin.Android.Build.Tests`
`8`	`8`	`{`
`9`		`- [Category ("UsesDevice"), Category ("AOT"), Category ("ProfiledAOT"), Category ("Node-3")]`
	`9`	`+ [Category ("UsesDevice"), Category ("AOT"), Category ("ProfiledAOT")]`
`10`	`10`	`public class AotProfileTests : DeviceTest`
`11`	`11`	`{`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Xamarin.Android.Build.Tests`
`11`	`11`	`{`
`12`	`12`	`[TestFixture]`
`13`	`13`	`[TestFixtureSource(nameof(FixtureArgs))]`
`14`		`- [Category ("Node-1"), Category ("XamarinBuildDownload")]`
	`14`	`+ [Category ("XamarinBuildDownload")]`
`15`	`15`	`public class BundleToolTests : DeviceTest`
`16`	`16`	`{`
`17`	`17`	`static readonly object[] FixtureArgs = {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`namespace Xamarin.Android.Build.Tests`
`21`	`21`	`{`
`22`	`22`	`[TestFixture]`
`23`		`- [Category ("UsesDevice"), Category ("Node-2")]`
	`23`	`+ [Category ("UsesDevice")]`
`24`	`24`	`[NonParallelizable]`
`25`	`25`	`public class DeploymentTest : DeviceTest {`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace Xamarin.Android.Build.Tests`
`9`	`9`	`{`
`10`	`10`	`[TestFixture]`
`11`		`- [Category ("UsesDevice"), Category ("Node-2")]`
	`11`	`+ [Category ("UsesDevice")]`
`12`	`12`	`public class InstallAndRunTests : DeviceTest`
`13`	`13`	`{`
`14`	`14`	`static ProjectBuilder builder;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Xamarin.Android.Build.Tests`
`13`	`13`	`{`
`14`	`14`	`[TestFixture]`
`15`		`- [Category ("Commercial"), Category ("UsesDevice"), Category ("Node-1")]`
	`15`	`+ [Category ("Commercial"), Category ("UsesDevice")]`
`16`	`16`	`public class InstallTests : DeviceTest`
`17`	`17`	`{`
`18`	`18`	`string GetContentFromAllOverrideDirectories (string packageName, bool useRunAsCommand = true)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace Xamarin.Android.Build.Tests`
`8`	`8`	`{`
`9`	`9`	`[TestFixture]`
`10`		`- [Category ("Commercial"), Category ("UsesDevice"), Category ("Node-3")]`
	`10`	`+ [Category ("Commercial"), Category ("UsesDevice")]`
`11`	`11`	`public class InstantRunTest : DeviceTest`
`12`	`12`	`{`
`13`	`13`	`[Test]`