cleanup

Author: EmandM

.yamato/_triggers.yml

@@ -42,21 +42,21 @@
 # In order to have better coverage we run desktop standalone tests with different configurations which allows to mostly cover for different platforms, scripting backends and editor versions.
 # This job will FIRST run "run_quick_checks" jobs (defined in _run-all.yml) since it's the dependency of project pack jobs which is on the lowest dependency tier. This runs the fastest checks (like PVP or code standards) and ONLY IF those pass it will run the rest of the tests.
 # This optimization allows to speed up feedback look for any "obvious" errors and save resources.
-# Since standards job is a part of initial checks it's not present as direct dependency here
+# Since standards job is a part of initial checks it's not present as direct dependency here!!!!!!!!!!!!!!!!!!!!
 pull_request_trigger:
   name: Pull Request Trigger (develop, develop-2.0.0, & release branches)
   dependencies:
-    # # Run package EditMode and Playmode package tests on trunk
-    # - .yamato/_run-all.yml#run_all_package_tests_trunk
-    # # Run package EditMode and Playmode package tests on minimum supported editor (6000.0 in case of NGOv2.X)
-    # - .yamato/_run-all.yml#run_all_package_tests_6000
-    # # Run project EditMode and PLaymode project tests on trunk
-    # - .yamato/_run-all.yml#run_all_project_tests_trunk
-    # # Run project EditMode and PLaymode project tests on minimum supported editor (6000.0 in case of NGOv2.X)
-    # - .yamato/_run-all.yml#run_all_project_tests_6000
-    # # Run standalone test with mixture of parameters to make sure there are no obvious issues with most common platform (for example --fail-on-assert option is not present with package/project tests). We run 2 different combinations with different platform/editor/scripting backend.
-    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk
-    # - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_mono_6000.0
+    # Run package EditMode and Playmode package tests on trunk
+    - .yamato/_run-all.yml#run_all_package_tests_trunk
+    # Run package EditMode and Playmode package tests on minimum supported editor (6000.0 in case of NGOv2.X)
+    - .yamato/_run-all.yml#run_all_package_tests_6000
+    # Run project EditMode and PLaymode project tests on trunk 
+    - .yamato/_run-all.yml#run_all_project_tests_trunk
+    # Run project EditMode and PLaymode project tests on minimum supported editor (6000.0 in case of NGOv2.X)
+    - .yamato/_run-all.yml#run_all_project_tests_6000
+    # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon
+    # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.0
   triggers:
     cancel_old_ci: true
     pull_requests:
@@ -81,7 +81,6 @@ develop_nightly:
   dependencies:
     # Run project standards to verify package/default project
     - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
-    - .yamato/project-standards.yml#standards_ubuntu_testproject_6000.0
     # Run APV jobs to make sure the change won't break any dependants
     - .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
     # Run package EditMode and Playmode tests on desktop platforms on trunk and 6000.0
@@ -134,4 +133,4 @@ develop_weekly_trunk:
     # Build player for webgl platform on trunk
     - .yamato/_run-all.yml#run_all_webgl_builds
     # Run code coverage test
-    - .yamato/code-coverage.yml#code_coverage_ubuntu_trunk
+    - .yamato/code-coverage.yml#code_coverage_ubuntu_trunk

com.unity.netcode.gameobjects/Tests/Runtime/PlayerObjectTests.cs

@@ -18,11 +18,6 @@ internal class PlayerObjectTests : NetcodeIntegrationTest
 
         protected GameObject m_NewPlayerToSpawn;
 
-        // TODO: [CmbServiceTests] Clients are disconnecting in a way that makes the cmb service slow to close and restart
-        protected override bool UseCMBService()
-        {
-            return true;
-        }
         public PlayerObjectTests(HostOrServer hostOrServer) : base(hostOrServer) { }
 
         protected override void OnServerAndClientsCreated()
@@ -75,11 +70,6 @@ internal class PlayerSpawnNoObserversTest : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
-        // TODO: [CmbServiceTests] Clients are disconnecting in a way that makes the cmb service slow to close and restart
-        protected override bool UseCMBService()
-        {
-            return true;
-        }
         public PlayerSpawnNoObserversTest(HostOrServer hostOrServer) : base(hostOrServer) { }
 
         protected override bool ShouldCheckForSpawnedPlayers()
@@ -141,11 +131,6 @@ internal class PlayerSpawnPositionTests : IntegrationTestWithApproximation
     {
         protected override int NumberOfClients => 2;
 
-        // TODO: [CmbServiceTests] Clients are disconnecting in a way that makes the cmb service slow to close and restart
-        protected override bool UseCMBService()
-        {
-            return true;
-        }
         public PlayerSpawnPositionTests(HostOrServer hostOrServer) : base(hostOrServer) { }
 
         private Vector3 m_PlayerPosition;
@@ -215,12 +200,6 @@ internal class PlayerSpawnAndDespawnTests : NetcodeIntegrationTest
 
         private StringBuilder m_ErrorLog = new StringBuilder();
 
-        // TODO: [CmbServiceTests] Clients are disconnecting in a way that makes the cmb service slow to close and restart
-        protected override bool UseCMBService()
-        {
-            return true;
-        }
-
         public PlayerSpawnAndDespawnTests(HostOrServer hostOrServer) : base(hostOrServer) { }
 
         private bool ValidateObservers(ulong playerClientId, NetworkObject player, ref List<NetworkManager> networkManagers)