Updated Wrench settings

Author: michalChrobot

.yamato/wrench/validation-jobs.yml

@@ -27,7 +27,7 @@ validate_-_netcode_gameobjects_-_6000_7_-_macos13arm:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 40
+    timeout: 90
     retries: 0
   - command: python PythonScripts/ignore_clean_console_failures.py
     timeout: 5
@@ -39,10 +39,10 @@ validate_-_netcode_gameobjects_-_6000_7_-_macos13arm:
     timeout: 10
     retries: 0
   - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -104,7 +104,7 @@ validate_-_netcode_gameobjects_-_6000_7_-_ubuntu2204:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 40
+    timeout: 90
     retries: 0
   - command: python PythonScripts/ignore_clean_console_failures.py
     timeout: 5
@@ -116,10 +116,10 @@ validate_-_netcode_gameobjects_-_6000_7_-_ubuntu2204:
     timeout: 10
     retries: 0
   - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -181,7 +181,7 @@ validate_-_netcode_gameobjects_-_6000_7_-_win10:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 40
+    timeout: 90
     retries: 0
   - command: python PythonScripts/ignore_clean_console_failures.py
     timeout: 5
@@ -193,10 +193,10 @@ validate_-_netcode_gameobjects_-_6000_7_-_win10:
     timeout: 10
     retries: 0
   - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
@@ -259,7 +259,7 @@ validate_-_netcode_gameobjects_-_7000_0_-_macos13arm:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 40
+    timeout: 90
     retries: 0
   - command: python PythonScripts/ignore_clean_console_failures.py
     timeout: 5
@@ -271,10 +271,10 @@ validate_-_netcode_gameobjects_-_7000_0_-_macos13arm:
     timeout: 10
     retries: 0
   - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -336,7 +336,7 @@ validate_-_netcode_gameobjects_-_7000_0_-_ubuntu2204:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 40
+    timeout: 90
     retries: 0
   - command: python PythonScripts/ignore_clean_console_failures.py
     timeout: 5
@@ -348,10 +348,10 @@ validate_-_netcode_gameobjects_-_7000_0_-_ubuntu2204:
     timeout: 10
     retries: 0
   - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -413,7 +413,7 @@ validate_-_netcode_gameobjects_-_7000_0_-_win10:
     retries: 1
   - command: echo No internal packages to add.
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 40
+    timeout: 90
     retries: 0
   - command: python PythonScripts/ignore_clean_console_failures.py
     timeout: 5
@@ -425,10 +425,10 @@ validate_-_netcode_gameobjects_-_7000_0_-_win10:
     timeout: 10
     retries: 0
   - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   - command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
+    timeout: 90
     retries: 1
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd

.yamato/wrench/wrench_config.json

@@ -23,7 +23,14 @@
       "coverageCommands": [
         "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;"
       ],
-      "dependantsToIgnoreInPreviewApv": {},
+      "dependantsToIgnoreInPreviewApv": {
+        "6000.7": [
+          "com.unity.services.multiplayer"
+        ],
+        "7000.0": [
+          "com.unity.services.multiplayer"
+        ]
+      },
       "postPackCommands": []
     }
   },

Tools/CI/Settings/NgoWrenchSettings.cs

@@ -1,7 +1,9 @@
 using RecipeEngine.Api.Settings;
+using RecipeEngine.Modules.Wrench.Helpers;
 using RecipeEngine.Modules.Wrench.Models;
 using RecipeEngine.Modules.Wrench.Platforms;
 using RecipeEngine.Modules.Wrench.Settings;
+using RecipeEngine.Unity.Abstractions.Editors;
 
 namespace NGO.Cookbook.Settings;
 
@@ -13,7 +15,7 @@ public class NgoWrenchSettings : AnnotatedSettingsBase
     static ValidationOptions validationOptions = new ValidationOptions()
     {
         ProjectPath = "testproject",
-        UtrTestingYamatoTimeout = 40
+        UtrTestingYamatoTimeout = 90
     };
 
     // update this to list all packages in this repo that you want to release.
@@ -34,6 +36,14 @@ public NgoWrenchSettings()
         Wrench = new WrenchSettings(packagesRootPaths, PackageOptions);
         Wrench.PvpProfilesToCheck = new HashSet<string>() { "supported" };
         Wrench.Packages["com.unity.netcode.gameobjects"].PackAndPromotePlatformType = EditorPlatformType.Ubuntu2204;
+
+        // com.unity.services.multiplayer tests reference NGO test helpers that aren't exposed in the APV project, so they fail to compile there.
+        var apvDependantsToIgnore = new HashSet<string> { "com.unity.services.multiplayer" };
+        Wrench.Packages["com.unity.netcode.gameobjects"].DependantsToIgnoreInPreviewApv = new Dictionary<Editor, ISet<string>>
+        {
+            [new EditorVersion("6000.7")] = apvDependantsToIgnore,
+            [new EditorVersion("7000.0")] = apvDependantsToIgnore
+        };
     }
 
     public WrenchSettings Wrench { get; private set; }