From 56f082898174bc4beffe48f8ae22e709c4c198e9 Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Tue, 2 Jun 2026 15:21:28 +0200 Subject: [PATCH 01/12] Fix warnings given by CI. --- .../Controls/InputControlExtensions.cs | 34 +++++++++---------- .../Runtime/Controls/InputControlList.cs | 4 +-- .../Runtime/Devices/Remote/InputRemoting.cs | 2 +- .../Runtime/Events/InputEventBuffer.cs | 2 +- .../InputSystem/Runtime/InputManager.cs | 4 +-- .../InputSystem/Runtime/InputSystem.cs | 10 +++--- .../InputSystem/Runtime/InputSystemState.cs | 2 +- .../EnhancedTouch/EnhancedTouchSupport.cs | 2 +- .../InputSystem/Runtime/Plugins/HID/HID.cs | 3 ++ .../Plugins/PlayerInput/PlayerInputManager.cs | 2 +- .../Runtime/State/InputStateBuffers.cs | 2 +- 11 files changed, 35 insertions(+), 32 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/InputControlExtensions.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/InputControlExtensions.cs index 32955d8716..419ac70a48 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/InputControlExtensions.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/InputControlExtensions.cs @@ -1616,7 +1616,7 @@ public struct ControlBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] public ControlBuilder At(InputDevice device, int index) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (device == null) throw new ArgumentNullException(nameof(device)); if (index < 0 || index >= device.m_ChildrenForEachControl.Length) @@ -1630,7 +1630,7 @@ public ControlBuilder At(InputDevice device, int index) [MethodImpl(MethodImplOptions.AggressiveInlining)] public ControlBuilder WithParent(InputControl parent) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (parent == null) throw new ArgumentNullException(nameof(parent)); if (parent == control) @@ -1643,7 +1643,7 @@ public ControlBuilder WithParent(InputControl parent) [MethodImpl(MethodImplOptions.AggressiveInlining)] public ControlBuilder WithName(string name) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name)); #endif @@ -1654,7 +1654,7 @@ public ControlBuilder WithName(string name) [MethodImpl(MethodImplOptions.AggressiveInlining)] public ControlBuilder WithDisplayName(string displayName) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (string.IsNullOrEmpty(displayName)) throw new ArgumentNullException(nameof(displayName)); #endif @@ -1665,7 +1665,7 @@ public ControlBuilder WithDisplayName(string displayName) [MethodImpl(MethodImplOptions.AggressiveInlining)] public ControlBuilder WithShortDisplayName(string shortDisplayName) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (string.IsNullOrEmpty(shortDisplayName)) throw new ArgumentNullException(nameof(shortDisplayName)); #endif @@ -1676,7 +1676,7 @@ public ControlBuilder WithShortDisplayName(string shortDisplayName) [MethodImpl(MethodImplOptions.AggressiveInlining)] public ControlBuilder WithLayout(InternedString layout) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (layout.IsEmpty()) throw new ArgumentException("Layout name cannot be empty", nameof(layout)); #endif @@ -1687,7 +1687,7 @@ public ControlBuilder WithLayout(InternedString layout) [MethodImpl(MethodImplOptions.AggressiveInlining)] public ControlBuilder WithUsages(int startIndex, int count) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (startIndex < 0 || startIndex >= control.device.m_UsagesForEachControl.Length) throw new ArgumentOutOfRangeException(nameof(startIndex)); if (count < 0 || startIndex + count > control.device.m_UsagesForEachControl.Length) @@ -1701,7 +1701,7 @@ public ControlBuilder WithUsages(int startIndex, int count) [MethodImpl(MethodImplOptions.AggressiveInlining)] public ControlBuilder WithAliases(int startIndex, int count) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (startIndex < 0 || startIndex >= control.device.m_AliasesForEachControl.Length) throw new ArgumentOutOfRangeException(nameof(startIndex)); if (count < 0 || startIndex + count > control.device.m_AliasesForEachControl.Length) @@ -1715,7 +1715,7 @@ public ControlBuilder WithAliases(int startIndex, int count) [MethodImpl(MethodImplOptions.AggressiveInlining)] public ControlBuilder WithChildren(int startIndex, int count) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (startIndex < 0 || startIndex >= control.device.m_ChildrenForEachControl.Length) throw new ArgumentOutOfRangeException(nameof(startIndex)); if (count < 0 || startIndex + count > control.device.m_ChildrenForEachControl.Length) @@ -1754,7 +1754,7 @@ public ControlBuilder WithProcessor(TProcessor processor) where TValue : struct where TProcessor : InputProcessor { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (processor == null) throw new ArgumentNullException(nameof(processor)); #endif @@ -1808,7 +1808,7 @@ public struct DeviceBuilder [MethodImpl(MethodImplOptions.AggressiveInlining)] public DeviceBuilder WithName(string name) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (string.IsNullOrEmpty(name)) throw new ArgumentNullException(nameof(name)); #endif @@ -1819,7 +1819,7 @@ public DeviceBuilder WithName(string name) [MethodImpl(MethodImplOptions.AggressiveInlining)] public DeviceBuilder WithDisplayName(string displayName) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (string.IsNullOrEmpty(displayName)) throw new ArgumentNullException(nameof(displayName)); #endif @@ -1830,7 +1830,7 @@ public DeviceBuilder WithDisplayName(string displayName) [MethodImpl(MethodImplOptions.AggressiveInlining)] public DeviceBuilder WithShortDisplayName(string shortDisplayName) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (string.IsNullOrEmpty(shortDisplayName)) throw new ArgumentNullException(nameof(shortDisplayName)); #endif @@ -1841,7 +1841,7 @@ public DeviceBuilder WithShortDisplayName(string shortDisplayName) [MethodImpl(MethodImplOptions.AggressiveInlining)] public DeviceBuilder WithLayout(InternedString layout) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (layout.IsEmpty()) throw new ArgumentException("Layout name cannot be empty", nameof(layout)); #endif @@ -1852,7 +1852,7 @@ public DeviceBuilder WithLayout(InternedString layout) [MethodImpl(MethodImplOptions.AggressiveInlining)] public DeviceBuilder WithChildren(int startIndex, int count) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (startIndex < 0 || startIndex >= device.device.m_ChildrenForEachControl.Length) throw new ArgumentOutOfRangeException(nameof(startIndex)); if (count < 0 || startIndex + count > device.device.m_ChildrenForEachControl.Length) @@ -1880,7 +1880,7 @@ public DeviceBuilder IsNoisy(bool value) [MethodImpl(MethodImplOptions.AggressiveInlining)] public DeviceBuilder WithControlUsage(int controlIndex, InternedString usage, InputControl control) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (controlIndex < 0 || controlIndex >= device.m_UsagesForEachControl.Length) throw new ArgumentOutOfRangeException(nameof(controlIndex)); if (usage.IsEmpty()) @@ -1896,7 +1896,7 @@ public DeviceBuilder WithControlUsage(int controlIndex, InternedString usage, In [MethodImpl(MethodImplOptions.AggressiveInlining)] public DeviceBuilder WithControlAlias(int controlIndex, InternedString alias) { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG if (controlIndex < 0 || controlIndex >= device.m_AliasesForEachControl.Length) throw new ArgumentOutOfRangeException(nameof(controlIndex)); if (alias.IsEmpty()) diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/InputControlList.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/InputControlList.cs index 92f123ac2e..2f82a3fafa 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/InputControlList.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/InputControlList.cs @@ -45,7 +45,7 @@ namespace UnityEngine.InputSystem /// /// Type of to store in the list. [DebuggerDisplay("Count = {Count}")] - #if UNITY_EDITOR || DEVELOPMENT_BUILD + #if DEBUG [DebuggerTypeProxy(typeof(InputControlListDebugView<>))] #endif public unsafe struct InputControlList : IList, IReadOnlyList, IDisposable @@ -597,7 +597,7 @@ public void Dispose() } } - #if UNITY_EDITOR || DEVELOPMENT_BUILD + #if DEBUG internal struct InputControlListDebugView where TControl : InputControl { diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Devices/Remote/InputRemoting.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Devices/Remote/InputRemoting.cs index 2d4ecb5eb9..30e2b8bcb0 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Devices/Remote/InputRemoting.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Devices/Remote/InputRemoting.cs @@ -757,7 +757,7 @@ private static TData DeserializeData(byte[] data) return JsonUtility.FromJson(json); } -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG // State we want to take across domain reloads. We can only take some of the // state across. Subscriptions will be lost and have to be manually restored. [Serializable] diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Events/InputEventBuffer.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Events/InputEventBuffer.cs index 872b4e93bb..267750ea39 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Events/InputEventBuffer.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Events/InputEventBuffer.cs @@ -298,7 +298,7 @@ internal void AdvanceToNextEvent(ref InputEvent* currentReadPos, if (numRemainingEvents > 1) { // Don't perform safety check in non-debug builds. - #if UNITY_EDITOR || DEVELOPMENT_BUILD + #if DEBUG newReadPos = InputEvent.GetNextInMemoryChecked(currentReadPos, ref this); #else newReadPos = InputEvent.GetNextInMemory(currentReadPos); diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/InputManager.cs index e7f6cd9ee9..9c714d8fe3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/InputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/InputManager.cs @@ -4481,7 +4481,7 @@ private bool FlipBuffersForDeviceIfNecessary(InputDevice device, InputUpdateType // Stuff everything that we want to survive a domain reload into // a m_SerializedState. - #if UNITY_EDITOR || DEVELOPMENT_BUILD + #if DEBUG [Serializable] internal struct DeviceState { @@ -4795,6 +4795,6 @@ private bool RestoreDeviceFromSavedState(ref DeviceState deviceState, InternedSt return true; } -#endif // UNITY_EDITOR || DEVELOPMENT_BUILD +#endif // DEBUG } } diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystem.cs index 1864b5d421..add6d2de9e 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystem.cs @@ -3366,7 +3366,7 @@ public static bool runInBackground internal static InputManager s_Manager; internal static InputRemoting s_Remote; -#if DEVELOPMENT_BUILD || UNITY_EDITOR +#if DEBUG private static RemoteInputPlayerConnection s_RemoteConnection; internal static RemoteInputPlayerConnection remoteConnection @@ -3410,8 +3410,8 @@ private static bool ShouldEnableRemoting() #endif } - #endif //!UNITY_EDITOR -#endif // DEVELOPMENT_BUILD || UNITY_EDITOR + #endif //!UNITY_EDITOR // +#endif // DEBUG // The rest here is internal stuff to manage singletons, survive domain reloads, // and to support the reset ability for tests. @@ -3506,8 +3506,8 @@ internal static void InitializeInPlayer(IInputRuntime runtime = null, bool loadS #endif // Automatically enable remoting in development players. - #if DEVELOPMENT_BUILD - if (ShouldEnableRemoting()) + #if !UNITY_EDITOR + if (Debug.isDebugBuild && ShouldEnableRemoting()) SetUpRemoting(); #endif diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystemState.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystemState.cs index b42cd90786..3ee3448b1b 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystemState.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystemState.cs @@ -5,7 +5,7 @@ namespace UnityEngine.InputSystem { -#if UNITY_EDITOR || DEVELOPMENT_BUILD +#if DEBUG /// /// Snapshot of the state used by the input system. /// diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/EnhancedTouchSupport.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/EnhancedTouchSupport.cs index 637c614446..f41c8299fa 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/EnhancedTouchSupport.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/EnhancedTouch/EnhancedTouchSupport.cs @@ -202,7 +202,7 @@ private static void OnBeforeDomainReload() #endif - [Conditional("DEVELOPMENT_BUILD")] + [Conditional("DEBUG")] [Conditional("UNITY_EDITOR")] internal static void CheckEnabled() { diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/HID/HID.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/HID/HID.cs index 9becfbe872..1be75e6844 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/HID/HID.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/HID/HID.cs @@ -323,6 +323,7 @@ private class HIDLayoutBuilder public string displayName; public HIDDeviceDescriptor hidDescriptor; public string parentLayout; + [NonSerialized] public Type deviceType; public InputControlLayout Build() @@ -517,7 +518,9 @@ public struct HIDElementDescriptor public HIDElementFlags flags; // Fields only relevant to arrays. + [NonSerialized] public int? usageMin; + [NonSerialized] public int? usageMax; public bool hasNullState => (flags & HIDElementFlags.NullState) == HIDElementFlags.NullState; diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/PlayerInput/PlayerInputManager.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/PlayerInput/PlayerInputManager.cs index 28f9338f61..e3c58e1e5b 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/PlayerInput/PlayerInputManager.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/PlayerInput/PlayerInputManager.cs @@ -706,7 +706,7 @@ private bool IsDeviceUsableWithPlayerActions(InputDevice device) private void ValidateInputActionAsset() { -#if DEVELOPMENT_BUILD || UNITY_EDITOR +#if DEBUG if (m_PlayerPrefab == null || m_PlayerPrefab.GetComponentInChildren() == null) return; diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/State/InputStateBuffers.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/State/InputStateBuffers.cs index eae5349bbe..4e09c70886 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/State/InputStateBuffers.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/State/InputStateBuffers.cs @@ -330,7 +330,7 @@ private static void MigrateDoubleBuffer(DoubleBuffers newBuffer, InputDevice[] d // NOTE: This also means that device indices of if (device.m_StateBlock.byteOffset == InputStateBlock.InvalidOffset) { - #if DEVELOPMENT_BUILD || UNITY_EDITOR + #if DEBUG for (var n = i + 1; n < deviceCount; ++n) Debug.Assert(devices[n].m_StateBlock.byteOffset == InputStateBlock.InvalidOffset, "New devices must be appended to the array; found an old device coming in the array after a newly added device"); From 43f5cd6301b3bf32b4bb9b5f2b78f427e8b7c640 Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Tue, 2 Jun 2026 15:37:02 +0200 Subject: [PATCH 02/12] Fix U PR warning. --- .../com.unity.inputsystem/InputSystem/Runtime/InputSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystem.cs index add6d2de9e..a2cd47bf74 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystem.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/InputSystem.cs @@ -3506,8 +3506,8 @@ internal static void InitializeInPlayer(IInputRuntime runtime = null, bool loadS #endif // Automatically enable remoting in development players. - #if !UNITY_EDITOR - if (Debug.isDebugBuild && ShouldEnableRemoting()) + #if DEBUG && !UNITY_EDITOR + if (ShouldEnableRemoting()) SetUpRemoting(); #endif From 03914e598ff1ee87e22f7794f52876031c056738 Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Tue, 2 Jun 2026 16:54:56 +0200 Subject: [PATCH 03/12] Fix warnings causing CI issues. --- .../Runtime/Utilities/MemoryHelpers.cs | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Runtime/Utilities/MemoryHelpers.cs b/Packages/com.unity.inputsystem/InputSystem/Runtime/Utilities/MemoryHelpers.cs index 21ad623ef2..040ae8d1aa 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Runtime/Utilities/MemoryHelpers.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Runtime/Utilities/MemoryHelpers.cs @@ -242,15 +242,16 @@ public static void MemSet(void* destination, int numBytes, byte value) unchecked { // 64bit blocks. - #if UNITY_64 - while (numBytes >= 8) + if (IntPtr.Size >= 8) { - *(ulong*)&to[pos] = ((ulong)value << 56) | ((ulong)value << 48) | ((ulong)value << 40) | ((ulong)value << 32) - | ((ulong)value << 24) | ((ulong)value << 16) | ((ulong)value << 8) | value; - numBytes -= 8; - pos += 8; + while (numBytes >= 8) + { + *(ulong*)&to[pos] = ((ulong)value << 56) | ((ulong)value << 48) | ((ulong)value << 40) | ((ulong)value << 32) + | ((ulong)value << 24) | ((ulong)value << 16) | ((ulong)value << 8) | value; + numBytes -= 8; + pos += 8; + } } - #endif // 32bit blocks. while (numBytes >= 4) @@ -288,15 +289,16 @@ public static void MemCpyMasked(void* destination, void* source, int numBytes, v unchecked { // Copy 64bit blocks. - #if UNITY_64 - while (numBytes >= 8) + if (IntPtr.Size >= 8) { - *(ulong*)(to + pos) &= ~*(ulong*)(bits + pos); // Preserve unmasked bits. - *(ulong*)(to + pos) |= *(ulong*)(from + pos) & *(ulong*)(bits + pos); // Copy masked bits. - numBytes -= 8; - pos += 8; + while (numBytes >= 8) + { + *(ulong*)(to + pos) &= ~*(ulong*)(bits + pos); // Preserve unmasked bits. + *(ulong*)(to + pos) |= *(ulong*)(from + pos) & *(ulong*)(bits + pos); // Copy masked bits. + numBytes -= 8; + pos += 8; + } } - #endif // Copy 32bit blocks. while (numBytes >= 4) From 7d1c21c8f89f209eb6e69c4a369a4295e6fd68f8 Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Mon, 1 Jun 2026 16:59:27 +0200 Subject: [PATCH 04/12] Update CI to ignore Unity 6.6 for now. --- Tools/CI/Settings/InputSystemSettings.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs index 09a47e3fe8..ac78f5cf1d 100644 --- a/Tools/CI/Settings/InputSystemSettings.cs +++ b/Tools/CI/Settings/InputSystemSettings.cs @@ -127,6 +127,11 @@ public InputSystemSettings() OverridePackagePlatform(InputSystemPackage); + foreach ((string name, WrenchPackage package) in Wrench.Packages) + { + Wrench.Packages[name].EditorPlatforms[SystemType.MacOS] = new Platform(new Agent("package-ci/macos-13-arm64:v4", FlavorType.MacDefault, ResourceType.VmOsx, "M1"), SystemType.MacOS); + } + ReadMobileConfig(); var oldIOSAgent = MobileTestPlatforms[SystemType.IOS].Agent; From 9399bec8ac566cb6bc284daaf89fcc733ab79203 Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 3 Jun 2026 11:59:47 +0200 Subject: [PATCH 05/12] Revert "Update CI to ignore Unity 6.6 for now." This reverts commit 7d1c21c8f89f209eb6e69c4a369a4295e6fd68f8. --- Tools/CI/Settings/InputSystemSettings.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs index ac78f5cf1d..09a47e3fe8 100644 --- a/Tools/CI/Settings/InputSystemSettings.cs +++ b/Tools/CI/Settings/InputSystemSettings.cs @@ -127,11 +127,6 @@ public InputSystemSettings() OverridePackagePlatform(InputSystemPackage); - foreach ((string name, WrenchPackage package) in Wrench.Packages) - { - Wrench.Packages[name].EditorPlatforms[SystemType.MacOS] = new Platform(new Agent("package-ci/macos-13-arm64:v4", FlavorType.MacDefault, ResourceType.VmOsx, "M1"), SystemType.MacOS); - } - ReadMobileConfig(); var oldIOSAgent = MobileTestPlatforms[SystemType.IOS].Agent; From 0ca2bf2c7178bc7ff25cbb67bbc871349cf80349 Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 3 Jun 2026 12:06:06 +0200 Subject: [PATCH 06/12] Update wrench. --- Tools/CI/Recipes/BaseRecipe.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Tools/CI/Recipes/BaseRecipe.cs b/Tools/CI/Recipes/BaseRecipe.cs index 3be420ed43..3478c1866c 100644 --- a/Tools/CI/Recipes/BaseRecipe.cs +++ b/Tools/CI/Recipes/BaseRecipe.cs @@ -35,11 +35,10 @@ public virtual IEnumerable GetJobs() List builders = new(); var package = Settings.InputSystemPackage; - var platforms = GetJobPlatforms(package); - foreach (var platform in platforms) + foreach (var unityEditor in package.UnityEditors) { - var supportedVersions = package.SupportedEditorVersions; - foreach (var version in supportedVersions) + var version = unityEditor.Version.Version; + foreach (var platform in GetJobPlatforms(unityEditor)) { builders.Add(ProduceJob(package, platform, version)); } @@ -74,7 +73,17 @@ public virtual IJobBuilder ProduceJob(Package package, Platform platform, string protected abstract IJobBuilder ProduceJob(string jobName, Package package, Platform platform, string unityVersion); /// - /// Implement this to provide the platforms for which this job should be generated. + /// Override to provide the platforms for a given UnityEditor instance. + /// Desktop recipes use this to respect per-editor platform sets (e.g. a platform + /// removed for a specific editor version will be absent here). + /// + /// The editor whose platforms should be returned. + /// The platforms for this editor. + public virtual IEnumerable GetJobPlatforms(UnityEditor unityEditor) => unityEditor.EditorPlatforms; + + /// + /// Override to provide a fixed platform list regardless of editor version. + /// Used by mobile recipes whose platforms come from config, not from UnityEditors. /// /// The package that the job should target. /// The system types. From 6c2095ad0d53dc62ae133fdfae9d0be7c07bffff Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 3 Jun 2026 14:18:07 +0200 Subject: [PATCH 07/12] Add missing using for UnityEditor namespace in BaseRecipe. Co-Authored-By: Claude Sonnet 4.6 --- Tools/CI/Recipes/BaseRecipe.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/CI/Recipes/BaseRecipe.cs b/Tools/CI/Recipes/BaseRecipe.cs index 3478c1866c..d71b7bd592 100644 --- a/Tools/CI/Recipes/BaseRecipe.cs +++ b/Tools/CI/Recipes/BaseRecipe.cs @@ -5,6 +5,7 @@ using RecipeEngine.Api.Platforms; using RecipeEngine.Api.Recipes; using RecipeEngine.Modules.Wrench.Models; +using RecipeEngine.Modules.Wrench.Platforms; using RecipeEngine.Platforms; using RecipeEngine.Unity.Abstractions.Packages; From 32447a5848f6b21de5028e10e110da18e1d61f6f Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 3 Jun 2026 15:06:13 +0200 Subject: [PATCH 08/12] Exclude MacOs13 jobs for Unity 6.6 due to Bad CPU type failures. Co-Authored-By: Claude Sonnet 4.6 --- .../input-system-editor-functional-tests.yml | 18 ----- .../input-system-editor-performance-tests.yml | 18 ----- ...put-system-standalone-functional-tests.yml | 18 ----- ...em-standalone-il2-cpp-functional-tests.yml | 18 ----- ...m-standalone-il2-cpp-performance-tests.yml | 18 ----- ...ut-system-standalone-performance-tests.yml | 18 ----- .yamato/triggers.yml | 6 -- .yamato/wrench/promotion-jobs.yml | 20 ----- .yamato/wrench/validation-jobs.yml | 73 ------------------- Tools/CI/Settings/InputSystemSettings.cs | 14 ++++ 10 files changed, 14 insertions(+), 207 deletions(-) diff --git a/.yamato/input-system-editor-functional-tests.yml b/.yamato/input-system-editor-functional-tests.yml index 2728774466..2dbcf6bd35 100644 --- a/.yamato/input-system-editor-functional-tests.yml +++ b/.yamato/input-system-editor-functional-tests.yml @@ -220,24 +220,6 @@ inputsystem-editorfunctionaltests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.6 - MacOS -inputsystem-editorfunctionaltests_-_6000_6_-_macos: - name: InputSystem-EditorFunctionalTests - 6000.6 - MacOS - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6_project;flags:inputsystem_MacOS_6000.6_project" --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu: name: InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-editor-performance-tests.yml b/.yamato/input-system-editor-performance-tests.yml index a0e060bbb9..ea2fa44ce4 100644 --- a/.yamato/input-system-editor-performance-tests.yml +++ b/.yamato/input-system-editor-performance-tests.yml @@ -220,24 +220,6 @@ inputsystem-editorperformancetests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.6 - MacOS -inputsystem-editorperformancetests_-_6000_6_-_macos: - name: InputSystem-EditorPerformanceTests - 6000.6 - MacOS - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu inputsystem-editorperformancetests_-_6000_6_-_ubuntu: name: InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-standalone-functional-tests.yml b/.yamato/input-system-standalone-functional-tests.yml index bc6f3de2ec..1d8fe499b8 100644 --- a/.yamato/input-system-standalone-functional-tests.yml +++ b/.yamato/input-system-standalone-functional-tests.yml @@ -220,24 +220,6 @@ inputsystem-standalonefunctionaltests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.6 - MacOS -inputsystem-standalonefunctionaltests_-_6000_6_-_macos: - name: InputSystem-StandaloneFunctionalTests - 6000.6 - MacOS - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneFunctionalTests - 6000.6 - Ubuntu inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu: name: InputSystem-StandaloneFunctionalTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml index a01e3347f3..7868a92fd7 100644 --- a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml @@ -220,24 +220,6 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOS -inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOS - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Ubuntu inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_ubuntu: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml index fc8fa9b7e5..1fdd628c94 100644 --- a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml @@ -220,24 +220,6 @@ inputsystem-standaloneil2cppperformancetests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOS -inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOS - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Ubuntu inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-standalone-performance-tests.yml b/.yamato/input-system-standalone-performance-tests.yml index a5158131e5..2c3e2f5bb7 100644 --- a/.yamato/input-system-standalone-performance-tests.yml +++ b/.yamato/input-system-standalone-performance-tests.yml @@ -220,24 +220,6 @@ inputsystem-standaloneperformancetests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.6 - MacOS -inputsystem-standaloneperformancetests_-_6000_6_-_macos: - name: InputSystem-StandalonePerformanceTests - 6000.6 - MacOS - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandalonePerformanceTests - 6000.6 - Ubuntu inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu: name: InputSystem-StandalonePerformanceTests - 6000.6 - Ubuntu diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml index 2f52d15349..93de5066b2 100644 --- a/.yamato/triggers.yml +++ b/.yamato/triggers.yml @@ -14,7 +14,6 @@ all_functional_tests: - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_macos - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_windows - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_macos - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_windows - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_tvos @@ -49,7 +48,6 @@ all_functional_tests: - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_macos - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_windows - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_macos - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_windows - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_macos @@ -60,7 +58,6 @@ all_functional_tests: - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_windows - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_windows - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_windows - path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_inputsystem triggers: @@ -85,7 +82,6 @@ all_performance_tests: - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_macos - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_ubuntu - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_windows - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_macos - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_ubuntu - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_windows - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_tvos @@ -120,7 +116,6 @@ all_performance_tests: - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_windows - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_windows - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_macos @@ -135,7 +130,6 @@ all_performance_tests: - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_macos - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_windows - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_macos - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_windows nightly_trigger: diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 8856e19f8f..38598d23a8 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -146,16 +146,6 @@ publish_dry_run_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.5-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.6-macos13 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.6-macos13 - unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_ubuntu2204 specific_options: packages: @@ -328,16 +318,6 @@ publish_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.5-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.6-macos13 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.6-macos13 - unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_ubuntu2204 specific_options: packages: diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 74b475758f..260d0f7c93 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -877,79 +877,6 @@ validate_-_inputsystem_-_6000_5_-_win10: labels: - Packages:inputsystem -# PVP Editor and Playmode tests for Validate - inputsystem - 6000.6 - macos13 (6000.6 - MacOS). -validate_-_inputsystem_-_6000_6_-_macos13: - name: Validate - inputsystem - 6000.6 - macos13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 - retries: 3 - - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor - timeout: 10 - 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: 20 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6;flags:inputsystem_MacOS_6000.6" --coverage-pkg-version=1.3.0 - timeout: 20 - retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Coverage: - paths: - - upm-ci~/CodeCoverage/** - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - test-inputsystem/Logs/** - - test-inputsystem/Library/*.log - - test-inputsystem/*.log - - test-inputsystem/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 - labels: - - Packages:inputsystem - # PVP Editor and Playmode tests for Validate - inputsystem - 6000.6 - ubuntu2204 (6000.6 - Ubuntu). validate_-_inputsystem_-_6000_6_-_ubuntu2204: name: Validate - inputsystem - 6000.6 - ubuntu2204 diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs index 09a47e3fe8..7c41b10e6a 100644 --- a/Tools/CI/Settings/InputSystemSettings.cs +++ b/Tools/CI/Settings/InputSystemSettings.cs @@ -126,6 +126,7 @@ public InputSystemSettings() Wrench.PvpProfilesToCheck = new HashSet() { "supported" }; OverridePackagePlatform(InputSystemPackage); + ExcludeUnsupportedPlatforms(InputSystemPackage); ReadMobileConfig(); @@ -149,6 +150,19 @@ private void OverridePackagePlatform(WrenchPackage package) } } + // MacOs13 jobs are currently failing for Unity 6.6 with "Bad CPU type in executable". + // Remove this once Mac support for 6.6 is confirmed working. + private void ExcludeUnsupportedPlatforms(WrenchPackage package) + { + foreach (UnityEditor unityEditor in package.UnityEditors) + { + if (unityEditor.Version.Version == "6000.6") + { + unityEditor.EditorPlatforms.Items.Remove(EditorPlatformType.MacOs13); + } + } + } + public WrenchSettings Wrench { get; private set; } void ReadMobileConfig() From 67fdb35623ce5afe71fc2a3c3018d21114f2f5fa Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 3 Jun 2026 16:16:19 +0200 Subject: [PATCH 09/12] Bump RecipeEngine.Modules.Wrench to 2.12.0 and regenerate CI. Co-Authored-By: Claude Sonnet 4.6 --- .../input-system-editor-functional-tests.yml | 26 ++- .../input-system-editor-performance-tests.yml | 26 ++- ...ut-system-mobile-functional-build-jobs.yml | 7 +- .../input-system-mobile-functional-tests.yml | 7 +- ...t-system-mobile-performance-build-jobs.yml | 7 +- .../input-system-mobile-performance-tests.yml | 7 +- ...put-system-standalone-functional-tests.yml | 26 ++- ...em-standalone-il2-cpp-functional-tests.yml | 26 ++- ...m-standalone-il2-cpp-performance-tests.yml | 26 ++- ...ut-system-standalone-performance-tests.yml | 26 ++- .yamato/triggers.yml | 13 +- .yamato/wrench/api-validation-jobs.yml | 15 +- .yamato/wrench/package-pack-jobs.yml | 9 +- .yamato/wrench/preview-a-p-v.yml | 130 ++++++----- .yamato/wrench/promotion-jobs.yml | 40 +++- .yamato/wrench/publish-trigger.yml | 7 +- .yamato/wrench/recipe-regeneration.yml | 11 +- .yamato/wrench/validation-jobs.yml | 221 ++++++++++++------ .yamato/wrench/wrench_config.json | 4 +- Tools/CI/InputSystem.Cookbook.csproj | 2 +- 20 files changed, 471 insertions(+), 165 deletions(-) diff --git a/.yamato/input-system-editor-functional-tests.yml b/.yamato/input-system-editor-functional-tests.yml index 2dbcf6bd35..b60ef7c40a 100644 --- a/.yamato/input-system-editor-functional-tests.yml +++ b/.yamato/input-system-editor-functional-tests.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.EditorFunctionalTests # InputSystem-EditorFunctionalTests - 6000.0 - MacOS inputsystem-editorfunctionaltests_-_6000_0_-_macos: @@ -220,6 +225,25 @@ inputsystem-editorfunctionaltests_-_6000_5_-_windows: paths: - artifacts/**/* +# InputSystem-EditorFunctionalTests - 6000.6 - MacOS +inputsystem-editorfunctionaltests_-_6000_6_-_macos: + name: InputSystem-EditorFunctionalTests - 6000.6 - MacOS + agent: + image: package-ci/macos-13-arm64:v4 + type: Unity::VM::osx + flavor: m1.mac + model: M1 + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6_project;flags:inputsystem_MacOS_6000.6_project" --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + # InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu: name: InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-editor-performance-tests.yml b/.yamato/input-system-editor-performance-tests.yml index ea2fa44ce4..e4c0e3d1f4 100644 --- a/.yamato/input-system-editor-performance-tests.yml +++ b/.yamato/input-system-editor-performance-tests.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.EditorPerformanceTests # InputSystem-EditorPerformanceTests - 6000.0 - MacOS inputsystem-editorperformancetests_-_6000_0_-_macos: @@ -220,6 +225,25 @@ inputsystem-editorperformancetests_-_6000_5_-_windows: paths: - artifacts/**/* +# InputSystem-EditorPerformanceTests - 6000.6 - MacOS +inputsystem-editorperformancetests_-_6000_6_-_macos: + name: InputSystem-EditorPerformanceTests - 6000.6 - MacOS + agent: + image: package-ci/macos-13-arm64:v4 + type: Unity::VM::osx + flavor: m1.mac + model: M1 + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + # InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu inputsystem-editorperformancetests_-_6000_6_-_ubuntu: name: InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-mobile-functional-build-jobs.yml b/.yamato/input-system-mobile-functional-build-jobs.yml index 8a9974d1e8..ababa4a3b1 100644 --- a/.yamato/input-system-mobile-functional-build-jobs.yml +++ b/.yamato/input-system-mobile-functional-build-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.MobileFunctionalBuildJobs # InputSystem-MobileFunctionalBuildJobs - 6000.0 - Android - il2cpp inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_android_-_il2cpp: diff --git a/.yamato/input-system-mobile-functional-tests.yml b/.yamato/input-system-mobile-functional-tests.yml index 3fcee160ed..31af4a8f81 100644 --- a/.yamato/input-system-mobile-functional-tests.yml +++ b/.yamato/input-system-mobile-functional-tests.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.MobileFunctionalTests # InputSystem-MobileFunctionalTests - 6000.0 - Android - il2cpp inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp: diff --git a/.yamato/input-system-mobile-performance-build-jobs.yml b/.yamato/input-system-mobile-performance-build-jobs.yml index 913fb56857..1e0c90b7c6 100644 --- a/.yamato/input-system-mobile-performance-build-jobs.yml +++ b/.yamato/input-system-mobile-performance-build-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.MobilePerformanceBuildJobs # InputSystem-MobilePerformanceBuildJobs - 6000.0 - Android - il2cpp inputsystem-mobileperformancebuildjobs_-_6000_0_-_android_-_il2cpp: diff --git a/.yamato/input-system-mobile-performance-tests.yml b/.yamato/input-system-mobile-performance-tests.yml index 77d840583a..83fdefbb71 100644 --- a/.yamato/input-system-mobile-performance-tests.yml +++ b/.yamato/input-system-mobile-performance-tests.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.MobilePerformanceTests # InputSystem-MobilePerformanceTests - 6000.0 - Android - il2cpp inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp: diff --git a/.yamato/input-system-standalone-functional-tests.yml b/.yamato/input-system-standalone-functional-tests.yml index 1d8fe499b8..a34592d1a7 100644 --- a/.yamato/input-system-standalone-functional-tests.yml +++ b/.yamato/input-system-standalone-functional-tests.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.StandaloneFunctionalTests # InputSystem-StandaloneFunctionalTests - 6000.0 - MacOS inputsystem-standalonefunctionaltests_-_6000_0_-_macos: @@ -220,6 +225,25 @@ inputsystem-standalonefunctionaltests_-_6000_5_-_windows: paths: - artifacts/**/* +# InputSystem-StandaloneFunctionalTests - 6000.6 - MacOS +inputsystem-standalonefunctionaltests_-_6000_6_-_macos: + name: InputSystem-StandaloneFunctionalTests - 6000.6 - MacOS + agent: + image: package-ci/macos-13-arm64:v4 + type: Unity::VM::osx + flavor: m1.mac + model: M1 + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + # InputSystem-StandaloneFunctionalTests - 6000.6 - Ubuntu inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu: name: InputSystem-StandaloneFunctionalTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml index 7868a92fd7..91bd7da94e 100644 --- a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.StandaloneIl2CppFunctionalTests # InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - MacOS inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_macos: @@ -220,6 +225,25 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_windows: paths: - artifacts/**/* +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOS +inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOS + agent: + image: package-ci/macos-13-arm64:v4 + type: Unity::VM::osx + flavor: m1.mac + model: M1 + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + # InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Ubuntu inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_ubuntu: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml index 1fdd628c94..580c0333db 100644 --- a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.StandaloneIl2CppPerformanceTests # InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - MacOS inputsystem-standaloneil2cppperformancetests_-_6000_0_-_macos: @@ -220,6 +225,25 @@ inputsystem-standaloneil2cppperformancetests_-_6000_5_-_windows: paths: - artifacts/**/* +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOS +inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOS + agent: + image: package-ci/macos-13-arm64:v4 + type: Unity::VM::osx + flavor: m1.mac + model: M1 + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + # InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Ubuntu inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Ubuntu diff --git a/.yamato/input-system-standalone-performance-tests.yml b/.yamato/input-system-standalone-performance-tests.yml index 2c3e2f5bb7..75fc270556 100644 --- a/.yamato/input-system-standalone-performance-tests.yml +++ b/.yamato/input-system-standalone-performance-tests.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.StandalonePerformanceTests # InputSystem-StandalonePerformanceTests - 6000.0 - MacOS inputsystem-standaloneperformancetests_-_6000_0_-_macos: @@ -220,6 +225,25 @@ inputsystem-standaloneperformancetests_-_6000_5_-_windows: paths: - artifacts/**/* +# InputSystem-StandalonePerformanceTests - 6000.6 - MacOS +inputsystem-standaloneperformancetests_-_6000_6_-_macos: + name: InputSystem-StandalonePerformanceTests - 6000.6 - MacOS + agent: + image: package-ci/macos-13-arm64:v4 + type: Unity::VM::osx + flavor: m1.mac + model: M1 + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + # InputSystem-StandalonePerformanceTests - 6000.6 - Ubuntu inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu: name: InputSystem-StandalonePerformanceTests - 6000.6 - Ubuntu diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml index 93de5066b2..3e783f04d2 100644 --- a/.yamato/triggers.yml +++ b/.yamato/triggers.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: InputSystem.Cookbook.Recipes.Triggers all_functional_tests: name: All Functional Tests dependencies: @@ -14,6 +19,7 @@ all_functional_tests: - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_macos - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_windows + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_macos - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_windows - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_tvos @@ -48,6 +54,7 @@ all_functional_tests: - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_macos - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_windows + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_macos - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_windows - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_macos @@ -58,6 +65,7 @@ all_functional_tests: - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_windows - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_windows + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_windows - path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_inputsystem triggers: @@ -82,6 +90,7 @@ all_performance_tests: - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_macos - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_ubuntu - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_windows + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_macos - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_ubuntu - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_windows - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_tvos @@ -116,6 +125,7 @@ all_performance_tests: - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_windows + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_windows - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_macos @@ -130,6 +140,7 @@ all_performance_tests: - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_macos - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_windows + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_macos - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_windows nightly_trigger: diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 805c88ce2e..2a6e692b55 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.ApiValidationJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb all_api_validation_jobs: name: All API Validation Jobs @@ -11,9 +16,9 @@ api_validation_-_inputsystem_-_6000_0_-_win10: agent: image: package-ci/win10:v4 type: Unity::VM - flavor: b1.xlarge + flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -55,8 +60,8 @@ api_validation_-_inputsystem_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index 600bd11237..b319f03d3b 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PackagePackJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Pack Input System @@ -26,5 +31,5 @@ package_pack_-_inputsystem: UPMCI_ACK_LARGE_PACKAGE: 1 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index 0fd9c57c3b..fc4128ebfc 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PreviewAPV # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Parent Preview APV Job. @@ -17,12 +22,12 @@ all_preview_apv_jobs: - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_macos13 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_ubuntu2204 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_win10 - - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_macos13 + - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_macos13arm - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_ubuntu2204 - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_win10 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS). preview_apv_-_6000_0_-_macos13: @@ -30,9 +35,9 @@ preview_apv_-_6000_0_-_macos13: agent: image: package-ci/macos-13:v4 type: Unity::VM::osx - flavor: b1.large + flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -77,10 +82,10 @@ preview_apv_-_6000_0_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu). preview_apv_-_6000_0_-_ubuntu2204: @@ -90,7 +95,7 @@ preview_apv_-_6000_0_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -135,10 +140,10 @@ preview_apv_-_6000_0_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.0 manifest (Windows). preview_apv_-_6000_0_-_win10: @@ -146,10 +151,10 @@ preview_apv_-_6000_0_-_win10: agent: image: package-ci/win10:v4 type: Unity::VM - flavor: b1.xlarge + flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -194,10 +199,10 @@ preview_apv_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.3 manifest (MacOS). preview_apv_-_6000_3_-_macos13: @@ -205,9 +210,9 @@ preview_apv_-_6000_3_-_macos13: agent: image: package-ci/macos-13:v4 type: Unity::VM::osx - flavor: b1.large + flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -252,10 +257,10 @@ preview_apv_-_6000_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu). preview_apv_-_6000_3_-_ubuntu2204: @@ -265,7 +270,7 @@ preview_apv_-_6000_3_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -310,10 +315,10 @@ preview_apv_-_6000_3_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.3 manifest (Windows). preview_apv_-_6000_3_-_win10: @@ -321,10 +326,10 @@ preview_apv_-_6000_3_-_win10: agent: image: package-ci/win10:v4 type: Unity::VM - flavor: b1.xlarge + flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -369,10 +374,10 @@ preview_apv_-_6000_3_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.4 manifest (MacOS). preview_apv_-_6000_4_-_macos13: @@ -380,9 +385,9 @@ preview_apv_-_6000_4_-_macos13: agent: image: package-ci/macos-13:v4 type: Unity::VM::osx - flavor: b1.large + flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -427,10 +432,10 @@ preview_apv_-_6000_4_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.4 manifest (Ubuntu). preview_apv_-_6000_4_-_ubuntu2204: @@ -440,7 +445,7 @@ preview_apv_-_6000_4_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -485,10 +490,10 @@ preview_apv_-_6000_4_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.4 manifest (Windows). preview_apv_-_6000_4_-_win10: @@ -496,10 +501,10 @@ preview_apv_-_6000_4_-_win10: agent: image: package-ci/win10:v4 type: Unity::VM - flavor: b1.xlarge + flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -544,10 +549,10 @@ preview_apv_-_6000_4_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.5 manifest (MacOS). preview_apv_-_6000_5_-_macos13: @@ -555,9 +560,9 @@ preview_apv_-_6000_5_-_macos13: agent: image: package-ci/macos-13:v4 type: Unity::VM::osx - flavor: b1.large + flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -602,10 +607,10 @@ preview_apv_-_6000_5_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu). preview_apv_-_6000_5_-_ubuntu2204: @@ -615,7 +620,7 @@ preview_apv_-_6000_5_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -660,10 +665,10 @@ preview_apv_-_6000_5_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.5 manifest (Windows). preview_apv_-_6000_5_-_win10: @@ -671,10 +676,10 @@ preview_apv_-_6000_5_-_win10: agent: image: package-ci/win10:v4 type: Unity::VM - flavor: b1.xlarge + flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -719,27 +724,28 @@ preview_apv_-_6000_5_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.6 manifest (MacOS). -preview_apv_-_6000_6_-_macos13: - name: Preview APV - 6000.6 - macos13 +preview_apv_-_6000_6_-_macos13arm: + name: Preview APV - 6000.6 - macos13arm agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx - flavor: b1.large + flavor: m1.mac + model: M1 commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm timeout: 20 retries: 10 - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast + - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast --arch arm64 timeout: 10 retries: 3 - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~ @@ -777,10 +783,10 @@ preview_apv_-_6000_6_-_macos13: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.6 manifest (Ubuntu). preview_apv_-_6000_6_-_ubuntu2204: @@ -790,7 +796,7 @@ preview_apv_-_6000_6_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -835,10 +841,10 @@ preview_apv_-_6000_6_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Functional tests for dependents found in the latest 6000.6 manifest (Windows). preview_apv_-_6000_6_-_win10: @@ -846,10 +852,10 @@ preview_apv_-_6000_6_-_win10: agent: image: package-ci/win10:v4 type: Unity::VM - flavor: b1.xlarge + flavor: b1.large commands: - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -894,8 +900,8 @@ preview_apv_-_6000_6_-_win10: UNITY_LICENSING_SERVER_DELETE_NUL: 0 UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 38598d23a8..aac7c5fcac 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PromotionJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Publish Dry Run for inputsystem to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm @@ -9,7 +14,7 @@ publish_dry_run_inputsystem: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -146,6 +151,16 @@ publish_dry_run_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.5-win10 unzip: true + - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13arm + specific_options: + packages: + ignore_artifact: true + pvp-results: + location: results/pvp/validate-inputsystem-6000.6-macos13arm + unzip: true + UTR: + location: results/UTR/validate-inputsystem-6000.6-macos13arm + unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_ubuntu2204 specific_options: packages: @@ -168,10 +183,10 @@ publish_dry_run_inputsystem: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 # Publish for inputsystem to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm publish_inputsystem: @@ -181,7 +196,7 @@ publish_inputsystem: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py @@ -318,6 +333,16 @@ publish_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.5-win10 unzip: true + - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13arm + specific_options: + packages: + ignore_artifact: true + pvp-results: + location: results/pvp/validate-inputsystem-6000.6-macos13arm + unzip: true + UTR: + location: results/UTR/validate-inputsystem-6000.6-macos13arm + unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_ubuntu2204 specific_options: packages: @@ -340,8 +365,9 @@ publish_inputsystem: unzip: true variables: UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 + allow_on: branch match "^release/.*" metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 diff --git a/.yamato/wrench/publish-trigger.yml b/.yamato/wrench/publish-trigger.yml index 35dd66f01c..7bfa02569f 100644 --- a/.yamato/wrench/publish-trigger.yml +++ b/.yamato/wrench/publish-trigger.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.PublishTrigger # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb all_promotion_related_jobs_promotiontrigger: name: All Promotion Related Jobs PromotionTrigger diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index 3a44a2a24a..1e00a6cd8d 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -1,11 +1,16 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.RecipeRegeneration # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # Test that Generated Wrench Jobs are up to date. test_-_wrench_jobs_up_to_date: name: Test - Wrench Jobs up to date agent: - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:v4 type: Unity::VM flavor: b1.large commands: @@ -26,5 +31,5 @@ test_-_wrench_jobs_up_to_date: cancel_old_ci: true metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 260d0f7c93..b646920748 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -1,4 +1,9 @@ -# Auto-generated by Recipe Engine, do not modify manually. +####################################################### +### ### +### Auto-generated by Recipe Engine, DO NOT EDIT. ### +### ### +####################################################### +# Source: RecipeEngine.Modules.Wrench.Recipes.ValidationJobs # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb # PVP Editor and Playmode tests for Validate - inputsystem - 6000.0 - macos13 (6000.0 - MacOS). @@ -9,12 +14,12 @@ validate_-_inputsystem_-_6000_0_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -29,7 +34,7 @@ validate_-_inputsystem_-_6000_0_-_macos13: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.0;flags:inputsystem_MacOS_6000.0" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.0;flags:inputsystem_MacOS_6000.0" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -67,10 +72,10 @@ validate_-_inputsystem_-_6000_0_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -82,12 +87,12 @@ validate_-_inputsystem_-_6000_0_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -102,7 +107,7 @@ validate_-_inputsystem_-_6000_0_-_ubuntu2204: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.0;flags:inputsystem_Ubuntu_6000.0" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.0;flags:inputsystem_Ubuntu_6000.0" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -140,10 +145,10 @@ validate_-_inputsystem_-_6000_0_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -155,12 +160,12 @@ validate_-_inputsystem_-_6000_0_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -175,7 +180,7 @@ validate_-_inputsystem_-_6000_0_-_win10: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.0;flags:inputsystem_Windows_6000.0" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.0;flags:inputsystem_Windows_6000.0" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -213,10 +218,10 @@ validate_-_inputsystem_-_6000_0_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -228,12 +233,12 @@ validate_-_inputsystem_-_6000_3_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -248,7 +253,7 @@ validate_-_inputsystem_-_6000_3_-_macos13: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.3;flags:inputsystem_MacOS_6000.3" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.3;flags:inputsystem_MacOS_6000.3" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -286,10 +291,10 @@ validate_-_inputsystem_-_6000_3_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -301,12 +306,12 @@ validate_-_inputsystem_-_6000_3_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -321,7 +326,7 @@ validate_-_inputsystem_-_6000_3_-_ubuntu2204: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.3;flags:inputsystem_Ubuntu_6000.3" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.3;flags:inputsystem_Ubuntu_6000.3" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -359,10 +364,10 @@ validate_-_inputsystem_-_6000_3_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -374,12 +379,12 @@ validate_-_inputsystem_-_6000_3_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -394,7 +399,7 @@ validate_-_inputsystem_-_6000_3_-_win10: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.3;flags:inputsystem_Windows_6000.3" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.3;flags:inputsystem_Windows_6000.3" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -432,10 +437,10 @@ validate_-_inputsystem_-_6000_3_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -447,12 +452,12 @@ validate_-_inputsystem_-_6000_4_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -467,7 +472,7 @@ validate_-_inputsystem_-_6000_4_-_macos13: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.4;flags:inputsystem_MacOS_6000.4" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.4;flags:inputsystem_MacOS_6000.4" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -505,10 +510,10 @@ validate_-_inputsystem_-_6000_4_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -520,12 +525,12 @@ validate_-_inputsystem_-_6000_4_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -540,7 +545,7 @@ validate_-_inputsystem_-_6000_4_-_ubuntu2204: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.4;flags:inputsystem_Ubuntu_6000.4" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.4;flags:inputsystem_Ubuntu_6000.4" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -578,10 +583,10 @@ validate_-_inputsystem_-_6000_4_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -593,12 +598,12 @@ validate_-_inputsystem_-_6000_4_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -613,7 +618,7 @@ validate_-_inputsystem_-_6000_4_-_win10: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.4;flags:inputsystem_Windows_6000.4" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.4;flags:inputsystem_Windows_6000.4" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -651,10 +656,10 @@ validate_-_inputsystem_-_6000_4_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -666,12 +671,12 @@ validate_-_inputsystem_-_6000_5_-_macos13: type: Unity::VM::osx flavor: b1.xlarge commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -686,7 +691,7 @@ validate_-_inputsystem_-_6000_5_-_macos13: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.5;flags:inputsystem_MacOS_6000.5" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.5;flags:inputsystem_MacOS_6000.5" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -724,10 +729,10 @@ validate_-_inputsystem_-_6000_5_-_macos13: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -739,12 +744,12 @@ validate_-_inputsystem_-_6000_5_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -759,7 +764,7 @@ validate_-_inputsystem_-_6000_5_-_ubuntu2204: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.5;flags:inputsystem_Ubuntu_6000.5" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.5;flags:inputsystem_Ubuntu_6000.5" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -797,10 +802,10 @@ validate_-_inputsystem_-_6000_5_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -812,12 +817,12 @@ validate_-_inputsystem_-_6000_5_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -832,7 +837,7 @@ validate_-_inputsystem_-_6000_5_-_win10: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.5;flags:inputsystem_Windows_6000.5" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.5;flags:inputsystem_Windows_6000.5" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -870,10 +875,84 @@ validate_-_inputsystem_-_6000_5_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 + labels: + - Packages:inputsystem + +# PVP Editor and Playmode tests for Validate - inputsystem - 6000.6 - macos13arm (6000.6 - MacOS). +validate_-_inputsystem_-_6000_6_-_macos13arm: + name: Validate - inputsystem - 6000.6 - macos13arm + agent: + image: package-ci/macos-13-arm64:v4 + type: Unity::VM::osx + flavor: m1.mac + model: M1 + commands: + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: 7z x -aoa wrench-localapv.zip + - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple + - command: python PythonScripts/print_machine_info.py + - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast --arch arm64 + timeout: 20 + retries: 3 + - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor + timeout: 10 + 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: 20 + retries: 0 + - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 5 + retries: 0 + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6;flags:inputsystem_MacOS_6000.6" --coverage-pkg-version=1.3.0 + timeout: 20 + retries: 1 + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + Coverage: + paths: + - upm-ci~/CodeCoverage/** + Crash Dumps: + paths: + - CrashDumps/** + packages: + paths: + - upm-ci~/packages/**/* + pvp-results: + paths: + - upm-ci~/pvp/**/* + browsable: onDemand + UTR: + paths: + - '*.log' + - '*.xml' + - artifacts/**/* + - test-inputsystem/Logs/** + - test-inputsystem/Library/*.log + - test-inputsystem/*.log + - test-inputsystem/Builds/*.log + - build/test-results/** + browsable: onDemand + dependencies: + - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem + variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 + metadata: + Job Maintainers: '#rm-packageworks' + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -885,12 +964,12 @@ validate_-_inputsystem_-_6000_6_-_ubuntu2204: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -905,7 +984,7 @@ validate_-_inputsystem_-_6000_6_-_ubuntu2204: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.6;flags:inputsystem_Ubuntu_6000.6" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.6;flags:inputsystem_Ubuntu_6000.6" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -943,10 +1022,10 @@ validate_-_inputsystem_-_6000_6_-_ubuntu2204: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem @@ -958,12 +1037,12 @@ validate_-_inputsystem_-_6000_6_-_win10: type: Unity::VM flavor: b1.large commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - command: 7z x -aoa wrench-localapv.zip - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - command: python PythonScripts/print_machine_info.py - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 10 + timeout: 20 retries: 3 - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor timeout: 10 @@ -978,7 +1057,7 @@ validate_-_inputsystem_-_6000_6_-_win10: - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json timeout: 10 retries: 0 - - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.6;flags:inputsystem_Windows_6000.6" --coverage-pkg-version=1.3.0 + - command: UnifiedTestRunner.exe --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.6;flags:inputsystem_Windows_6000.6" --coverage-pkg-version=1.3.0 timeout: 20 retries: 1 after: @@ -1016,10 +1095,10 @@ validate_-_inputsystem_-_6000_6_-_win10: UNITY_LICENSING_SERVER_DELETE_ULF: 0 UNITY_LICENSING_SERVER_TOOLSET: pro UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.2.1.0 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 metadata: Job Maintainers: '#rm-packageworks' - Wrench: 2.2.1.0 + Wrench: 2.12.0.0 labels: - Packages:inputsystem diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json index c494f2b0b9..3d2f84326b 100644 --- a/.yamato/wrench/wrench_config.json +++ b/.yamato/wrench/wrench_config.json @@ -24,7 +24,7 @@ "MaxEditorVersion": "", "coverageEnabled": true, "coverageCommands": [ - "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;" + "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;" ], "dependantsToIgnoreInPreviewApv": { "6000.5": [ @@ -49,7 +49,7 @@ }, "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_inputsystem", "branch_pattern": "ReleaseSlash", - "wrench_version": "2.2.1.0", + "wrench_version": "2.12.0.0", "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json", "cs_project_path": "Tools/CI/InputSystem.Cookbook.csproj" } \ No newline at end of file diff --git a/Tools/CI/InputSystem.Cookbook.csproj b/Tools/CI/InputSystem.Cookbook.csproj index 7251a728ad..8e6b817c60 100644 --- a/Tools/CI/InputSystem.Cookbook.csproj +++ b/Tools/CI/InputSystem.Cookbook.csproj @@ -8,7 +8,7 @@ - + From f260cd0019cde6999222a7c2050c5a2201aa455b Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 3 Jun 2026 16:18:44 +0200 Subject: [PATCH 10/12] Use EditorPlatformType in job names and re-enable Mac for 6.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit EditorPlatformType is more granular than SystemType — both MacOs13 and MacOs13Arm resolve to SystemType.MacOS, which caused duplicate job key errors after the Wrench 2.12.0 bump added MacOs13Arm to the default platform set. Switching to EditorPlatformType makes each job name unique. Also removes the temporary ExcludeUnsupportedPlatforms workaround for Unity 6.6 Mac jobs, which should no longer be needed with Wrench 2.12.0. Co-Authored-By: Claude Sonnet 4.6 --- .../input-system-editor-functional-tests.yml | 108 +++++----- .../input-system-editor-performance-tests.yml | 108 +++++----- ...put-system-standalone-functional-tests.yml | 108 +++++----- ...em-standalone-il2-cpp-functional-tests.yml | 108 +++++----- ...m-standalone-il2-cpp-performance-tests.yml | 108 +++++----- ...ut-system-standalone-performance-tests.yml | 108 +++++----- .yamato/triggers.yml | 186 +++++++++--------- .yamato/wrench/promotion-jobs.yml | 20 ++ .yamato/wrench/validation-jobs.yml | 73 +++++++ Tools/CI/Recipes/BaseRecipe.cs | 8 +- Tools/CI/Settings/InputSystemSettings.cs | 14 -- 11 files changed, 573 insertions(+), 376 deletions(-) diff --git a/.yamato/input-system-editor-functional-tests.yml b/.yamato/input-system-editor-functional-tests.yml index b60ef7c40a..2a280f9d6c 100644 --- a/.yamato/input-system-editor-functional-tests.yml +++ b/.yamato/input-system-editor-functional-tests.yml @@ -5,9 +5,9 @@ ####################################################### # Source: InputSystem.Cookbook.Recipes.EditorFunctionalTests -# InputSystem-EditorFunctionalTests - 6000.0 - MacOS -inputsystem-editorfunctionaltests_-_6000_0_-_macos: - name: InputSystem-EditorFunctionalTests - 6000.0 - MacOS +# InputSystem-EditorFunctionalTests - 6000.0 - MacOs13 +inputsystem-editorfunctionaltests_-_6000_0_-_macos13: + name: InputSystem-EditorFunctionalTests - 6000.0 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -23,9 +23,9 @@ inputsystem-editorfunctionaltests_-_6000_0_-_macos: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.0 - Ubuntu -inputsystem-editorfunctionaltests_-_6000_0_-_ubuntu: - name: InputSystem-EditorFunctionalTests - 6000.0 - Ubuntu +# InputSystem-EditorFunctionalTests - 6000.0 - Ubuntu2204 +inputsystem-editorfunctionaltests_-_6000_0_-_ubuntu2204: + name: InputSystem-EditorFunctionalTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -41,9 +41,9 @@ inputsystem-editorfunctionaltests_-_6000_0_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.0 - Windows -inputsystem-editorfunctionaltests_-_6000_0_-_windows: - name: InputSystem-EditorFunctionalTests - 6000.0 - Windows +# InputSystem-EditorFunctionalTests - 6000.0 - Win10 +inputsystem-editorfunctionaltests_-_6000_0_-_win10: + name: InputSystem-EditorFunctionalTests - 6000.0 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -60,9 +60,9 @@ inputsystem-editorfunctionaltests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.3 - MacOS -inputsystem-editorfunctionaltests_-_6000_3_-_macos: - name: InputSystem-EditorFunctionalTests - 6000.3 - MacOS +# InputSystem-EditorFunctionalTests - 6000.3 - MacOs13 +inputsystem-editorfunctionaltests_-_6000_3_-_macos13: + name: InputSystem-EditorFunctionalTests - 6000.3 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -78,9 +78,9 @@ inputsystem-editorfunctionaltests_-_6000_3_-_macos: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.3 - Ubuntu -inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu: - name: InputSystem-EditorFunctionalTests - 6000.3 - Ubuntu +# InputSystem-EditorFunctionalTests - 6000.3 - Ubuntu2204 +inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu2204: + name: InputSystem-EditorFunctionalTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -96,9 +96,9 @@ inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.3 - Windows -inputsystem-editorfunctionaltests_-_6000_3_-_windows: - name: InputSystem-EditorFunctionalTests - 6000.3 - Windows +# InputSystem-EditorFunctionalTests - 6000.3 - Win10 +inputsystem-editorfunctionaltests_-_6000_3_-_win10: + name: InputSystem-EditorFunctionalTests - 6000.3 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -115,9 +115,9 @@ inputsystem-editorfunctionaltests_-_6000_3_-_windows: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.4 - MacOS -inputsystem-editorfunctionaltests_-_6000_4_-_macos: - name: InputSystem-EditorFunctionalTests - 6000.4 - MacOS +# InputSystem-EditorFunctionalTests - 6000.4 - MacOs13 +inputsystem-editorfunctionaltests_-_6000_4_-_macos13: + name: InputSystem-EditorFunctionalTests - 6000.4 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -133,9 +133,9 @@ inputsystem-editorfunctionaltests_-_6000_4_-_macos: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.4 - Ubuntu -inputsystem-editorfunctionaltests_-_6000_4_-_ubuntu: - name: InputSystem-EditorFunctionalTests - 6000.4 - Ubuntu +# InputSystem-EditorFunctionalTests - 6000.4 - Ubuntu2204 +inputsystem-editorfunctionaltests_-_6000_4_-_ubuntu2204: + name: InputSystem-EditorFunctionalTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -151,9 +151,9 @@ inputsystem-editorfunctionaltests_-_6000_4_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.4 - Windows -inputsystem-editorfunctionaltests_-_6000_4_-_windows: - name: InputSystem-EditorFunctionalTests - 6000.4 - Windows +# InputSystem-EditorFunctionalTests - 6000.4 - Win10 +inputsystem-editorfunctionaltests_-_6000_4_-_win10: + name: InputSystem-EditorFunctionalTests - 6000.4 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -170,9 +170,9 @@ inputsystem-editorfunctionaltests_-_6000_4_-_windows: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.5 - MacOS -inputsystem-editorfunctionaltests_-_6000_5_-_macos: - name: InputSystem-EditorFunctionalTests - 6000.5 - MacOS +# InputSystem-EditorFunctionalTests - 6000.5 - MacOs13 +inputsystem-editorfunctionaltests_-_6000_5_-_macos13: + name: InputSystem-EditorFunctionalTests - 6000.5 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -188,9 +188,9 @@ inputsystem-editorfunctionaltests_-_6000_5_-_macos: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.5 - Ubuntu -inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu: - name: InputSystem-EditorFunctionalTests - 6000.5 - Ubuntu +# InputSystem-EditorFunctionalTests - 6000.5 - Ubuntu2204 +inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu2204: + name: InputSystem-EditorFunctionalTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -206,9 +206,9 @@ inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.5 - Windows -inputsystem-editorfunctionaltests_-_6000_5_-_windows: - name: InputSystem-EditorFunctionalTests - 6000.5 - Windows +# InputSystem-EditorFunctionalTests - 6000.5 - Win10 +inputsystem-editorfunctionaltests_-_6000_5_-_win10: + name: InputSystem-EditorFunctionalTests - 6000.5 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -225,9 +225,27 @@ inputsystem-editorfunctionaltests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.6 - MacOS -inputsystem-editorfunctionaltests_-_6000_6_-_macos: - name: InputSystem-EditorFunctionalTests - 6000.6 - MacOS +# InputSystem-EditorFunctionalTests - 6000.6 - MacOs13 +inputsystem-editorfunctionaltests_-_6000_6_-_macos13: + name: InputSystem-EditorFunctionalTests - 6000.6 - MacOs13 + agent: + image: package-ci/macos-13:v4 + type: Unity::VM::osx + flavor: b1.xlarge + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6_project;flags:inputsystem_MacOS_6000.6_project" --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + +# InputSystem-EditorFunctionalTests - 6000.6 - MacOs13Arm +inputsystem-editorfunctionaltests_-_6000_6_-_macos13arm: + name: InputSystem-EditorFunctionalTests - 6000.6 - MacOs13Arm agent: image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx @@ -244,9 +262,9 @@ inputsystem-editorfunctionaltests_-_6000_6_-_macos: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu -inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu: - name: InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu +# InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu2204 +inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu2204: + name: InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -262,9 +280,9 @@ inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.6 - Windows -inputsystem-editorfunctionaltests_-_6000_6_-_windows: - name: InputSystem-EditorFunctionalTests - 6000.6 - Windows +# InputSystem-EditorFunctionalTests - 6000.6 - Win10 +inputsystem-editorfunctionaltests_-_6000_6_-_win10: + name: InputSystem-EditorFunctionalTests - 6000.6 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM diff --git a/.yamato/input-system-editor-performance-tests.yml b/.yamato/input-system-editor-performance-tests.yml index e4c0e3d1f4..6c90331f99 100644 --- a/.yamato/input-system-editor-performance-tests.yml +++ b/.yamato/input-system-editor-performance-tests.yml @@ -5,9 +5,9 @@ ####################################################### # Source: InputSystem.Cookbook.Recipes.EditorPerformanceTests -# InputSystem-EditorPerformanceTests - 6000.0 - MacOS -inputsystem-editorperformancetests_-_6000_0_-_macos: - name: InputSystem-EditorPerformanceTests - 6000.0 - MacOS +# InputSystem-EditorPerformanceTests - 6000.0 - MacOs13 +inputsystem-editorperformancetests_-_6000_0_-_macos13: + name: InputSystem-EditorPerformanceTests - 6000.0 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -23,9 +23,9 @@ inputsystem-editorperformancetests_-_6000_0_-_macos: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.0 - Ubuntu -inputsystem-editorperformancetests_-_6000_0_-_ubuntu: - name: InputSystem-EditorPerformanceTests - 6000.0 - Ubuntu +# InputSystem-EditorPerformanceTests - 6000.0 - Ubuntu2204 +inputsystem-editorperformancetests_-_6000_0_-_ubuntu2204: + name: InputSystem-EditorPerformanceTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -41,9 +41,9 @@ inputsystem-editorperformancetests_-_6000_0_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.0 - Windows -inputsystem-editorperformancetests_-_6000_0_-_windows: - name: InputSystem-EditorPerformanceTests - 6000.0 - Windows +# InputSystem-EditorPerformanceTests - 6000.0 - Win10 +inputsystem-editorperformancetests_-_6000_0_-_win10: + name: InputSystem-EditorPerformanceTests - 6000.0 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -60,9 +60,9 @@ inputsystem-editorperformancetests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.3 - MacOS -inputsystem-editorperformancetests_-_6000_3_-_macos: - name: InputSystem-EditorPerformanceTests - 6000.3 - MacOS +# InputSystem-EditorPerformanceTests - 6000.3 - MacOs13 +inputsystem-editorperformancetests_-_6000_3_-_macos13: + name: InputSystem-EditorPerformanceTests - 6000.3 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -78,9 +78,9 @@ inputsystem-editorperformancetests_-_6000_3_-_macos: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.3 - Ubuntu -inputsystem-editorperformancetests_-_6000_3_-_ubuntu: - name: InputSystem-EditorPerformanceTests - 6000.3 - Ubuntu +# InputSystem-EditorPerformanceTests - 6000.3 - Ubuntu2204 +inputsystem-editorperformancetests_-_6000_3_-_ubuntu2204: + name: InputSystem-EditorPerformanceTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -96,9 +96,9 @@ inputsystem-editorperformancetests_-_6000_3_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.3 - Windows -inputsystem-editorperformancetests_-_6000_3_-_windows: - name: InputSystem-EditorPerformanceTests - 6000.3 - Windows +# InputSystem-EditorPerformanceTests - 6000.3 - Win10 +inputsystem-editorperformancetests_-_6000_3_-_win10: + name: InputSystem-EditorPerformanceTests - 6000.3 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -115,9 +115,9 @@ inputsystem-editorperformancetests_-_6000_3_-_windows: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.4 - MacOS -inputsystem-editorperformancetests_-_6000_4_-_macos: - name: InputSystem-EditorPerformanceTests - 6000.4 - MacOS +# InputSystem-EditorPerformanceTests - 6000.4 - MacOs13 +inputsystem-editorperformancetests_-_6000_4_-_macos13: + name: InputSystem-EditorPerformanceTests - 6000.4 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -133,9 +133,9 @@ inputsystem-editorperformancetests_-_6000_4_-_macos: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu -inputsystem-editorperformancetests_-_6000_4_-_ubuntu: - name: InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu +# InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu2204 +inputsystem-editorperformancetests_-_6000_4_-_ubuntu2204: + name: InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -151,9 +151,9 @@ inputsystem-editorperformancetests_-_6000_4_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.4 - Windows -inputsystem-editorperformancetests_-_6000_4_-_windows: - name: InputSystem-EditorPerformanceTests - 6000.4 - Windows +# InputSystem-EditorPerformanceTests - 6000.4 - Win10 +inputsystem-editorperformancetests_-_6000_4_-_win10: + name: InputSystem-EditorPerformanceTests - 6000.4 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -170,9 +170,9 @@ inputsystem-editorperformancetests_-_6000_4_-_windows: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.5 - MacOS -inputsystem-editorperformancetests_-_6000_5_-_macos: - name: InputSystem-EditorPerformanceTests - 6000.5 - MacOS +# InputSystem-EditorPerformanceTests - 6000.5 - MacOs13 +inputsystem-editorperformancetests_-_6000_5_-_macos13: + name: InputSystem-EditorPerformanceTests - 6000.5 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -188,9 +188,9 @@ inputsystem-editorperformancetests_-_6000_5_-_macos: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu -inputsystem-editorperformancetests_-_6000_5_-_ubuntu: - name: InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu +# InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu2204 +inputsystem-editorperformancetests_-_6000_5_-_ubuntu2204: + name: InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -206,9 +206,9 @@ inputsystem-editorperformancetests_-_6000_5_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.5 - Windows -inputsystem-editorperformancetests_-_6000_5_-_windows: - name: InputSystem-EditorPerformanceTests - 6000.5 - Windows +# InputSystem-EditorPerformanceTests - 6000.5 - Win10 +inputsystem-editorperformancetests_-_6000_5_-_win10: + name: InputSystem-EditorPerformanceTests - 6000.5 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -225,9 +225,27 @@ inputsystem-editorperformancetests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.6 - MacOS -inputsystem-editorperformancetests_-_6000_6_-_macos: - name: InputSystem-EditorPerformanceTests - 6000.6 - MacOS +# InputSystem-EditorPerformanceTests - 6000.6 - MacOs13 +inputsystem-editorperformancetests_-_6000_6_-_macos13: + name: InputSystem-EditorPerformanceTests - 6000.6 - MacOs13 + agent: + image: package-ci/macos-13:v4 + type: Unity::VM::osx + flavor: b1.xlarge + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + +# InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm +inputsystem-editorperformancetests_-_6000_6_-_macos13arm: + name: InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm agent: image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx @@ -244,9 +262,9 @@ inputsystem-editorperformancetests_-_6000_6_-_macos: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu -inputsystem-editorperformancetests_-_6000_6_-_ubuntu: - name: InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu +# InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu2204 +inputsystem-editorperformancetests_-_6000_6_-_ubuntu2204: + name: InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -262,9 +280,9 @@ inputsystem-editorperformancetests_-_6000_6_-_ubuntu: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.6 - Windows -inputsystem-editorperformancetests_-_6000_6_-_windows: - name: InputSystem-EditorPerformanceTests - 6000.6 - Windows +# InputSystem-EditorPerformanceTests - 6000.6 - Win10 +inputsystem-editorperformancetests_-_6000_6_-_win10: + name: InputSystem-EditorPerformanceTests - 6000.6 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM diff --git a/.yamato/input-system-standalone-functional-tests.yml b/.yamato/input-system-standalone-functional-tests.yml index a34592d1a7..b4628abba4 100644 --- a/.yamato/input-system-standalone-functional-tests.yml +++ b/.yamato/input-system-standalone-functional-tests.yml @@ -5,9 +5,9 @@ ####################################################### # Source: InputSystem.Cookbook.Recipes.StandaloneFunctionalTests -# InputSystem-StandaloneFunctionalTests - 6000.0 - MacOS -inputsystem-standalonefunctionaltests_-_6000_0_-_macos: - name: InputSystem-StandaloneFunctionalTests - 6000.0 - MacOS +# InputSystem-StandaloneFunctionalTests - 6000.0 - MacOs13 +inputsystem-standalonefunctionaltests_-_6000_0_-_macos13: + name: InputSystem-StandaloneFunctionalTests - 6000.0 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -23,9 +23,9 @@ inputsystem-standalonefunctionaltests_-_6000_0_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.0 - Ubuntu -inputsystem-standalonefunctionaltests_-_6000_0_-_ubuntu: - name: InputSystem-StandaloneFunctionalTests - 6000.0 - Ubuntu +# InputSystem-StandaloneFunctionalTests - 6000.0 - Ubuntu2204 +inputsystem-standalonefunctionaltests_-_6000_0_-_ubuntu2204: + name: InputSystem-StandaloneFunctionalTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -41,9 +41,9 @@ inputsystem-standalonefunctionaltests_-_6000_0_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.0 - Windows -inputsystem-standalonefunctionaltests_-_6000_0_-_windows: - name: InputSystem-StandaloneFunctionalTests - 6000.0 - Windows +# InputSystem-StandaloneFunctionalTests - 6000.0 - Win10 +inputsystem-standalonefunctionaltests_-_6000_0_-_win10: + name: InputSystem-StandaloneFunctionalTests - 6000.0 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -60,9 +60,9 @@ inputsystem-standalonefunctionaltests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.3 - MacOS -inputsystem-standalonefunctionaltests_-_6000_3_-_macos: - name: InputSystem-StandaloneFunctionalTests - 6000.3 - MacOS +# InputSystem-StandaloneFunctionalTests - 6000.3 - MacOs13 +inputsystem-standalonefunctionaltests_-_6000_3_-_macos13: + name: InputSystem-StandaloneFunctionalTests - 6000.3 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -78,9 +78,9 @@ inputsystem-standalonefunctionaltests_-_6000_3_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.3 - Ubuntu -inputsystem-standalonefunctionaltests_-_6000_3_-_ubuntu: - name: InputSystem-StandaloneFunctionalTests - 6000.3 - Ubuntu +# InputSystem-StandaloneFunctionalTests - 6000.3 - Ubuntu2204 +inputsystem-standalonefunctionaltests_-_6000_3_-_ubuntu2204: + name: InputSystem-StandaloneFunctionalTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -96,9 +96,9 @@ inputsystem-standalonefunctionaltests_-_6000_3_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.3 - Windows -inputsystem-standalonefunctionaltests_-_6000_3_-_windows: - name: InputSystem-StandaloneFunctionalTests - 6000.3 - Windows +# InputSystem-StandaloneFunctionalTests - 6000.3 - Win10 +inputsystem-standalonefunctionaltests_-_6000_3_-_win10: + name: InputSystem-StandaloneFunctionalTests - 6000.3 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -115,9 +115,9 @@ inputsystem-standalonefunctionaltests_-_6000_3_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.4 - MacOS -inputsystem-standalonefunctionaltests_-_6000_4_-_macos: - name: InputSystem-StandaloneFunctionalTests - 6000.4 - MacOS +# InputSystem-StandaloneFunctionalTests - 6000.4 - MacOs13 +inputsystem-standalonefunctionaltests_-_6000_4_-_macos13: + name: InputSystem-StandaloneFunctionalTests - 6000.4 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -133,9 +133,9 @@ inputsystem-standalonefunctionaltests_-_6000_4_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.4 - Ubuntu -inputsystem-standalonefunctionaltests_-_6000_4_-_ubuntu: - name: InputSystem-StandaloneFunctionalTests - 6000.4 - Ubuntu +# InputSystem-StandaloneFunctionalTests - 6000.4 - Ubuntu2204 +inputsystem-standalonefunctionaltests_-_6000_4_-_ubuntu2204: + name: InputSystem-StandaloneFunctionalTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -151,9 +151,9 @@ inputsystem-standalonefunctionaltests_-_6000_4_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.4 - Windows -inputsystem-standalonefunctionaltests_-_6000_4_-_windows: - name: InputSystem-StandaloneFunctionalTests - 6000.4 - Windows +# InputSystem-StandaloneFunctionalTests - 6000.4 - Win10 +inputsystem-standalonefunctionaltests_-_6000_4_-_win10: + name: InputSystem-StandaloneFunctionalTests - 6000.4 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -170,9 +170,9 @@ inputsystem-standalonefunctionaltests_-_6000_4_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.5 - MacOS -inputsystem-standalonefunctionaltests_-_6000_5_-_macos: - name: InputSystem-StandaloneFunctionalTests - 6000.5 - MacOS +# InputSystem-StandaloneFunctionalTests - 6000.5 - MacOs13 +inputsystem-standalonefunctionaltests_-_6000_5_-_macos13: + name: InputSystem-StandaloneFunctionalTests - 6000.5 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -188,9 +188,9 @@ inputsystem-standalonefunctionaltests_-_6000_5_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.5 - Ubuntu -inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu: - name: InputSystem-StandaloneFunctionalTests - 6000.5 - Ubuntu +# InputSystem-StandaloneFunctionalTests - 6000.5 - Ubuntu2204 +inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu2204: + name: InputSystem-StandaloneFunctionalTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -206,9 +206,9 @@ inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.5 - Windows -inputsystem-standalonefunctionaltests_-_6000_5_-_windows: - name: InputSystem-StandaloneFunctionalTests - 6000.5 - Windows +# InputSystem-StandaloneFunctionalTests - 6000.5 - Win10 +inputsystem-standalonefunctionaltests_-_6000_5_-_win10: + name: InputSystem-StandaloneFunctionalTests - 6000.5 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -225,9 +225,27 @@ inputsystem-standalonefunctionaltests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.6 - MacOS -inputsystem-standalonefunctionaltests_-_6000_6_-_macos: - name: InputSystem-StandaloneFunctionalTests - 6000.6 - MacOS +# InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13 +inputsystem-standalonefunctionaltests_-_6000_6_-_macos13: + name: InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13 + agent: + image: package-ci/macos-13:v4 + type: Unity::VM::osx + flavor: b1.xlarge + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + +# InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13Arm +inputsystem-standalonefunctionaltests_-_6000_6_-_macos13arm: + name: InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13Arm agent: image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx @@ -244,9 +262,9 @@ inputsystem-standalonefunctionaltests_-_6000_6_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.6 - Ubuntu -inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu: - name: InputSystem-StandaloneFunctionalTests - 6000.6 - Ubuntu +# InputSystem-StandaloneFunctionalTests - 6000.6 - Ubuntu2204 +inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu2204: + name: InputSystem-StandaloneFunctionalTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -262,9 +280,9 @@ inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.6 - Windows -inputsystem-standalonefunctionaltests_-_6000_6_-_windows: - name: InputSystem-StandaloneFunctionalTests - 6000.6 - Windows +# InputSystem-StandaloneFunctionalTests - 6000.6 - Win10 +inputsystem-standalonefunctionaltests_-_6000_6_-_win10: + name: InputSystem-StandaloneFunctionalTests - 6000.6 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM diff --git a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml index 91bd7da94e..d2cf9bf895 100644 --- a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml @@ -5,9 +5,9 @@ ####################################################### # Source: InputSystem.Cookbook.Recipes.StandaloneIl2CppFunctionalTests -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - MacOS -inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_macos: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - MacOS +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - MacOs13 +inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_macos13: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -23,9 +23,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - Ubuntu -inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_ubuntu: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - Ubuntu +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - Ubuntu2204 +inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -41,9 +41,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - Windows -inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_windows: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - Windows +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - Win10 +inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_win10: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -60,9 +60,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - MacOS -inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_macos: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - MacOS +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - MacOs13 +inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_macos13: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -78,9 +78,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - Ubuntu -inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_ubuntu: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - Ubuntu +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - Ubuntu2204 +inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -96,9 +96,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - Windows -inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_windows: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - Windows +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - Win10 +inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_win10: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -115,9 +115,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - MacOS -inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_macos: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - MacOS +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - MacOs13 +inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_macos13: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -133,9 +133,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - Ubuntu -inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_ubuntu: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - Ubuntu +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - Ubuntu2204 +inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -151,9 +151,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - Windows -inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_windows: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - Windows +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - Win10 +inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_win10: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -170,9 +170,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - MacOS -inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - MacOS +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - MacOs13 +inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos13: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -188,9 +188,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Ubuntu -inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_ubuntu: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Ubuntu +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Ubuntu2204 +inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -206,9 +206,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Windows -inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_windows: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Windows +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Win10 +inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_win10: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -225,9 +225,27 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOS -inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOS +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13 +inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13 + agent: + image: package-ci/macos-13:v4 + type: Unity::VM::osx + flavor: b1.xlarge + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13Arm +inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13arm: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13Arm agent: image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx @@ -244,9 +262,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Ubuntu -inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_ubuntu: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Ubuntu +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Ubuntu2204 +inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -262,9 +280,9 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Windows -inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_windows: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Windows +# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Win10 +inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_win10: + name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM diff --git a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml index 580c0333db..c135078d95 100644 --- a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml @@ -5,9 +5,9 @@ ####################################################### # Source: InputSystem.Cookbook.Recipes.StandaloneIl2CppPerformanceTests -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - MacOS -inputsystem-standaloneil2cppperformancetests_-_6000_0_-_macos: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - MacOS +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - MacOs13 +inputsystem-standaloneil2cppperformancetests_-_6000_0_-_macos13: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -23,9 +23,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_0_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - Ubuntu -inputsystem-standaloneil2cppperformancetests_-_6000_0_-_ubuntu: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - Ubuntu +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - Ubuntu2204 +inputsystem-standaloneil2cppperformancetests_-_6000_0_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -41,9 +41,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_0_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - Windows -inputsystem-standaloneil2cppperformancetests_-_6000_0_-_windows: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - Windows +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - Win10 +inputsystem-standaloneil2cppperformancetests_-_6000_0_-_win10: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -60,9 +60,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - MacOS -inputsystem-standaloneil2cppperformancetests_-_6000_3_-_macos: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - MacOS +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - MacOs13 +inputsystem-standaloneil2cppperformancetests_-_6000_3_-_macos13: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -78,9 +78,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_3_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - Ubuntu -inputsystem-standaloneil2cppperformancetests_-_6000_3_-_ubuntu: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - Ubuntu +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - Ubuntu2204 +inputsystem-standaloneil2cppperformancetests_-_6000_3_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -96,9 +96,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_3_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - Windows -inputsystem-standaloneil2cppperformancetests_-_6000_3_-_windows: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - Windows +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - Win10 +inputsystem-standaloneil2cppperformancetests_-_6000_3_-_win10: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -115,9 +115,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_3_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - MacOS -inputsystem-standaloneil2cppperformancetests_-_6000_4_-_macos: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - MacOS +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - MacOs13 +inputsystem-standaloneil2cppperformancetests_-_6000_4_-_macos13: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -133,9 +133,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_4_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - Ubuntu -inputsystem-standaloneil2cppperformancetests_-_6000_4_-_ubuntu: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - Ubuntu +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - Ubuntu2204 +inputsystem-standaloneil2cppperformancetests_-_6000_4_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -151,9 +151,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_4_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - Windows -inputsystem-standaloneil2cppperformancetests_-_6000_4_-_windows: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - Windows +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - Win10 +inputsystem-standaloneil2cppperformancetests_-_6000_4_-_win10: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -170,9 +170,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_4_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - MacOS -inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - MacOS +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - MacOs13 +inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos13: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -188,9 +188,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Ubuntu -inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Ubuntu +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Ubuntu2204 +inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -206,9 +206,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Windows -inputsystem-standaloneil2cppperformancetests_-_6000_5_-_windows: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Windows +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Win10 +inputsystem-standaloneil2cppperformancetests_-_6000_5_-_win10: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -225,9 +225,27 @@ inputsystem-standaloneil2cppperformancetests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOS -inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOS +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13 +inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13 + agent: + image: package-ci/macos-13:v4 + type: Unity::VM::osx + flavor: b1.xlarge + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13Arm +inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13arm: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13Arm agent: image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx @@ -244,9 +262,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Ubuntu -inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Ubuntu +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Ubuntu2204 +inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu2204: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -262,9 +280,9 @@ inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Windows -inputsystem-standaloneil2cppperformancetests_-_6000_6_-_windows: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Windows +# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Win10 +inputsystem-standaloneil2cppperformancetests_-_6000_6_-_win10: + name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM diff --git a/.yamato/input-system-standalone-performance-tests.yml b/.yamato/input-system-standalone-performance-tests.yml index 75fc270556..0d063d3a04 100644 --- a/.yamato/input-system-standalone-performance-tests.yml +++ b/.yamato/input-system-standalone-performance-tests.yml @@ -5,9 +5,9 @@ ####################################################### # Source: InputSystem.Cookbook.Recipes.StandalonePerformanceTests -# InputSystem-StandalonePerformanceTests - 6000.0 - MacOS -inputsystem-standaloneperformancetests_-_6000_0_-_macos: - name: InputSystem-StandalonePerformanceTests - 6000.0 - MacOS +# InputSystem-StandalonePerformanceTests - 6000.0 - MacOs13 +inputsystem-standaloneperformancetests_-_6000_0_-_macos13: + name: InputSystem-StandalonePerformanceTests - 6000.0 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -23,9 +23,9 @@ inputsystem-standaloneperformancetests_-_6000_0_-_macos: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.0 - Ubuntu -inputsystem-standaloneperformancetests_-_6000_0_-_ubuntu: - name: InputSystem-StandalonePerformanceTests - 6000.0 - Ubuntu +# InputSystem-StandalonePerformanceTests - 6000.0 - Ubuntu2204 +inputsystem-standaloneperformancetests_-_6000_0_-_ubuntu2204: + name: InputSystem-StandalonePerformanceTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -41,9 +41,9 @@ inputsystem-standaloneperformancetests_-_6000_0_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.0 - Windows -inputsystem-standaloneperformancetests_-_6000_0_-_windows: - name: InputSystem-StandalonePerformanceTests - 6000.0 - Windows +# InputSystem-StandalonePerformanceTests - 6000.0 - Win10 +inputsystem-standaloneperformancetests_-_6000_0_-_win10: + name: InputSystem-StandalonePerformanceTests - 6000.0 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -60,9 +60,9 @@ inputsystem-standaloneperformancetests_-_6000_0_-_windows: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.3 - MacOS -inputsystem-standaloneperformancetests_-_6000_3_-_macos: - name: InputSystem-StandalonePerformanceTests - 6000.3 - MacOS +# InputSystem-StandalonePerformanceTests - 6000.3 - MacOs13 +inputsystem-standaloneperformancetests_-_6000_3_-_macos13: + name: InputSystem-StandalonePerformanceTests - 6000.3 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -78,9 +78,9 @@ inputsystem-standaloneperformancetests_-_6000_3_-_macos: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.3 - Ubuntu -inputsystem-standaloneperformancetests_-_6000_3_-_ubuntu: - name: InputSystem-StandalonePerformanceTests - 6000.3 - Ubuntu +# InputSystem-StandalonePerformanceTests - 6000.3 - Ubuntu2204 +inputsystem-standaloneperformancetests_-_6000_3_-_ubuntu2204: + name: InputSystem-StandalonePerformanceTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -96,9 +96,9 @@ inputsystem-standaloneperformancetests_-_6000_3_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.3 - Windows -inputsystem-standaloneperformancetests_-_6000_3_-_windows: - name: InputSystem-StandalonePerformanceTests - 6000.3 - Windows +# InputSystem-StandalonePerformanceTests - 6000.3 - Win10 +inputsystem-standaloneperformancetests_-_6000_3_-_win10: + name: InputSystem-StandalonePerformanceTests - 6000.3 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -115,9 +115,9 @@ inputsystem-standaloneperformancetests_-_6000_3_-_windows: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.4 - MacOS -inputsystem-standaloneperformancetests_-_6000_4_-_macos: - name: InputSystem-StandalonePerformanceTests - 6000.4 - MacOS +# InputSystem-StandalonePerformanceTests - 6000.4 - MacOs13 +inputsystem-standaloneperformancetests_-_6000_4_-_macos13: + name: InputSystem-StandalonePerformanceTests - 6000.4 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -133,9 +133,9 @@ inputsystem-standaloneperformancetests_-_6000_4_-_macos: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.4 - Ubuntu -inputsystem-standaloneperformancetests_-_6000_4_-_ubuntu: - name: InputSystem-StandalonePerformanceTests - 6000.4 - Ubuntu +# InputSystem-StandalonePerformanceTests - 6000.4 - Ubuntu2204 +inputsystem-standaloneperformancetests_-_6000_4_-_ubuntu2204: + name: InputSystem-StandalonePerformanceTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -151,9 +151,9 @@ inputsystem-standaloneperformancetests_-_6000_4_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.4 - Windows -inputsystem-standaloneperformancetests_-_6000_4_-_windows: - name: InputSystem-StandalonePerformanceTests - 6000.4 - Windows +# InputSystem-StandalonePerformanceTests - 6000.4 - Win10 +inputsystem-standaloneperformancetests_-_6000_4_-_win10: + name: InputSystem-StandalonePerformanceTests - 6000.4 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -170,9 +170,9 @@ inputsystem-standaloneperformancetests_-_6000_4_-_windows: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.5 - MacOS -inputsystem-standaloneperformancetests_-_6000_5_-_macos: - name: InputSystem-StandalonePerformanceTests - 6000.5 - MacOS +# InputSystem-StandalonePerformanceTests - 6000.5 - MacOs13 +inputsystem-standaloneperformancetests_-_6000_5_-_macos13: + name: InputSystem-StandalonePerformanceTests - 6000.5 - MacOs13 agent: image: package-ci/macos-13:v4 type: Unity::VM::osx @@ -188,9 +188,9 @@ inputsystem-standaloneperformancetests_-_6000_5_-_macos: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.5 - Ubuntu -inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu: - name: InputSystem-StandalonePerformanceTests - 6000.5 - Ubuntu +# InputSystem-StandalonePerformanceTests - 6000.5 - Ubuntu2204 +inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu2204: + name: InputSystem-StandalonePerformanceTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -206,9 +206,9 @@ inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.5 - Windows -inputsystem-standaloneperformancetests_-_6000_5_-_windows: - name: InputSystem-StandalonePerformanceTests - 6000.5 - Windows +# InputSystem-StandalonePerformanceTests - 6000.5 - Win10 +inputsystem-standaloneperformancetests_-_6000_5_-_win10: + name: InputSystem-StandalonePerformanceTests - 6000.5 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM @@ -225,9 +225,27 @@ inputsystem-standaloneperformancetests_-_6000_5_-_windows: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.6 - MacOS -inputsystem-standaloneperformancetests_-_6000_6_-_macos: - name: InputSystem-StandalonePerformanceTests - 6000.6 - MacOS +# InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13 +inputsystem-standaloneperformancetests_-_6000_6_-_macos13: + name: InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13 + agent: + image: package-ci/macos-13:v4 + type: Unity::VM::osx + flavor: b1.xlarge + commands: + - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools + - command: unity-downloader-cli -u trunk -c Editor --fast --wait + - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + artifacts: + paths: + - artifacts/**/* + +# InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13Arm +inputsystem-standaloneperformancetests_-_6000_6_-_macos13arm: + name: InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13Arm agent: image: package-ci/macos-13-arm64:v4 type: Unity::VM::osx @@ -244,9 +262,9 @@ inputsystem-standaloneperformancetests_-_6000_6_-_macos: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.6 - Ubuntu -inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu: - name: InputSystem-StandalonePerformanceTests - 6000.6 - Ubuntu +# InputSystem-StandalonePerformanceTests - 6000.6 - Ubuntu2204 +inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu2204: + name: InputSystem-StandalonePerformanceTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 type: Unity::VM @@ -262,9 +280,9 @@ inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.6 - Windows -inputsystem-standaloneperformancetests_-_6000_6_-_windows: - name: InputSystem-StandalonePerformanceTests - 6000.6 - Windows +# InputSystem-StandalonePerformanceTests - 6000.6 - Win10 +inputsystem-standaloneperformancetests_-_6000_6_-_win10: + name: InputSystem-StandalonePerformanceTests - 6000.6 - Win10 agent: image: package-ci/win10:v4 type: Unity::VM diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml index 3e783f04d2..e884c42475 100644 --- a/.yamato/triggers.yml +++ b/.yamato/triggers.yml @@ -7,21 +7,22 @@ all_functional_tests: name: All Functional Tests dependencies: - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_0_-_macos - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_0_-_ubuntu - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_0_-_windows - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_macos - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_windows - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_4_-_macos - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_4_-_ubuntu - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_4_-_windows - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_macos - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_windows - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_macos - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_windows + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_0_-_macos13 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_0_-_ubuntu2204 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_0_-_win10 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_macos13 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu2204 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_3_-_win10 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_4_-_macos13 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_4_-_ubuntu2204 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_4_-_win10 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_macos13 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu2204 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_win10 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_macos13 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_macos13arm + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu2204 + - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_win10 - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_tvos - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_tvos - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_tvos @@ -42,31 +43,33 @@ all_functional_tests: - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_6_-_android_-_il2cpp - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_6_-_android_-_mono - path: .yamato/input-system-mobile-functional-tests.yml#inputsystem-mobilefunctionaltests_-_6000_6_-_ios - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_0_-_macos - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_0_-_ubuntu - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_0_-_windows - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_macos - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_ubuntu - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_windows - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_4_-_macos - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_4_-_ubuntu - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_4_-_windows - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_macos - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_windows - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_macos - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_windows - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_macos - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_windows - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_macos - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_windows - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_macos - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_windows - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_windows - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_windows + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_0_-_macos13 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_0_-_ubuntu2204 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_0_-_win10 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_macos13 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_ubuntu2204 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_3_-_win10 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_4_-_macos13 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_4_-_ubuntu2204 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_4_-_win10 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_macos13 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu2204 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_win10 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_macos13 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_macos13arm + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu2204 + - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_win10 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_win10 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_win10 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_win10 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_win10 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13arm + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_win10 - path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_inputsystem triggers: expression: |- @@ -78,21 +81,22 @@ all_functional_tests: all_performance_tests: name: All Performance Tests dependencies: - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_0_-_macos - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_0_-_ubuntu - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_0_-_windows - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_macos - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_ubuntu - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_windows - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_4_-_macos - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_4_-_ubuntu - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_4_-_windows - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_macos - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_ubuntu - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_windows - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_macos - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_ubuntu - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_windows + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_0_-_macos13 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_0_-_ubuntu2204 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_0_-_win10 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_macos13 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_ubuntu2204 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_3_-_win10 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_4_-_macos13 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_4_-_ubuntu2204 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_4_-_win10 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_macos13 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_ubuntu2204 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_win10 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_macos13 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_macos13arm + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_ubuntu2204 + - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_win10 - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_tvos - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_tvos - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_tvos @@ -113,44 +117,46 @@ all_performance_tests: - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_6_-_android_-_il2cpp - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_6_-_android_-_mono - path: .yamato/input-system-mobile-performance-tests.yml#inputsystem-mobileperformancetests_-_6000_6_-_ios - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_0_-_macos - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_0_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_0_-_windows - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_macos - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_windows - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_4_-_macos - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_4_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_4_-_windows - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_windows - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_windows - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_macos - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_ubuntu - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_windows - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_macos - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_ubuntu - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_windows - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_4_-_macos - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_4_-_ubuntu - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_4_-_windows - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_macos - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_windows - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_macos - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_windows + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_0_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_0_-_ubuntu2204 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_0_-_win10 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_ubuntu2204 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_3_-_win10 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_4_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_4_-_ubuntu2204 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_4_-_win10 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu2204 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_win10 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13arm + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu2204 + - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_win10 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_macos13 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_ubuntu2204 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_0_-_win10 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_macos13 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_ubuntu2204 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_3_-_win10 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_4_-_macos13 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_4_-_ubuntu2204 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_4_-_win10 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_macos13 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu2204 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_win10 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_macos13 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_macos13arm + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu2204 + - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_win10 nightly_trigger: name: Nightly trigger dependencies: - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_ubuntu - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_ubuntu + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_ubuntu2204 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_ubuntu2204 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_ubuntu2204 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_ubuntu2204 + - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_ubuntu2204 - path: .yamato/triggers.yml#all_performance_tests triggers: recurring: diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index aac7c5fcac..e122abf91f 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -151,6 +151,16 @@ publish_dry_run_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.5-win10 unzip: true + - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13 + specific_options: + packages: + ignore_artifact: true + pvp-results: + location: results/pvp/validate-inputsystem-6000.6-macos13 + unzip: true + UTR: + location: results/UTR/validate-inputsystem-6000.6-macos13 + unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13arm specific_options: packages: @@ -333,6 +343,16 @@ publish_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.5-win10 unzip: true + - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13 + specific_options: + packages: + ignore_artifact: true + pvp-results: + location: results/pvp/validate-inputsystem-6000.6-macos13 + unzip: true + UTR: + location: results/UTR/validate-inputsystem-6000.6-macos13 + unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13arm specific_options: packages: diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index b646920748..15cfadd528 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -882,6 +882,79 @@ validate_-_inputsystem_-_6000_5_-_win10: labels: - Packages:inputsystem +# PVP Editor and Playmode tests for Validate - inputsystem - 6000.6 - macos13 (6000.6 - MacOS). +validate_-_inputsystem_-_6000_6_-_macos13: + name: Validate - inputsystem - 6000.6 - macos13 + agent: + image: package-ci/macos-13:v4 + type: Unity::VM::osx + flavor: b1.xlarge + commands: + - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip + - command: 7z x -aoa wrench-localapv.zip + - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple + - command: python PythonScripts/print_machine_info.py + - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast + timeout: 20 + retries: 3 + - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor + timeout: 10 + 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: 20 + retries: 0 + - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 5 + retries: 0 + - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json + timeout: 10 + retries: 0 + - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6;flags:inputsystem_MacOS_6000.6" --coverage-pkg-version=1.3.0 + timeout: 20 + retries: 1 + after: + - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh + artifacts: + Coverage: + paths: + - upm-ci~/CodeCoverage/** + Crash Dumps: + paths: + - CrashDumps/** + packages: + paths: + - upm-ci~/packages/**/* + pvp-results: + paths: + - upm-ci~/pvp/**/* + browsable: onDemand + UTR: + paths: + - '*.log' + - '*.xml' + - artifacts/**/* + - test-inputsystem/Logs/** + - test-inputsystem/Library/*.log + - test-inputsystem/*.log + - test-inputsystem/Builds/*.log + - build/test-results/** + browsable: onDemand + dependencies: + - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem + variables: + UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ + UNITY_LICENSING_SERVER_DELETE_NUL: 0 + UNITY_LICENSING_SERVER_DELETE_ULF: 0 + UNITY_LICENSING_SERVER_TOOLSET: pro + UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 + UPMPVP_CONTEXT_WRENCH: 2.12.0.0 + metadata: + Job Maintainers: '#rm-packageworks' + Wrench: 2.12.0.0 + labels: + - Packages:inputsystem + # PVP Editor and Playmode tests for Validate - inputsystem - 6000.6 - macos13arm (6000.6 - MacOS). validate_-_inputsystem_-_6000_6_-_macos13arm: name: Validate - inputsystem - 6000.6 - macos13arm diff --git a/Tools/CI/Recipes/BaseRecipe.cs b/Tools/CI/Recipes/BaseRecipe.cs index d71b7bd592..ec3a6de4b0 100644 --- a/Tools/CI/Recipes/BaseRecipe.cs +++ b/Tools/CI/Recipes/BaseRecipe.cs @@ -39,9 +39,11 @@ public virtual IEnumerable GetJobs() foreach (var unityEditor in package.UnityEditors) { var version = unityEditor.Version.Version; - foreach (var platform in GetJobPlatforms(unityEditor)) + foreach (var (platformType, editorPlatform) in unityEditor.EditorPlatforms.Items) { - builders.Add(ProduceJob(package, platform, version)); + var platform = new Platform(editorPlatform.Agent, editorPlatform.System); + var jobName = GetJobName(version, platformType); + builders.Add(ProduceJob(jobName, package, platform, version)); } } @@ -91,6 +93,8 @@ public virtual IJobBuilder ProduceJob(Package package, Platform platform, string public virtual IEnumerable GetJobPlatforms(WrenchPackage package) => package.UnityEditors[0].EditorPlatforms; protected virtual string GetName() => Name; + protected string GetJobName(string editorVersion, EditorPlatformType platformType) + => $"{GetName()} - {editorVersion} - {platformType}"; protected string GetJobName(string editorVersion, SystemType systemType) => $"{GetName()} - {editorVersion} - {systemType}"; } diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs index 7c41b10e6a..09a47e3fe8 100644 --- a/Tools/CI/Settings/InputSystemSettings.cs +++ b/Tools/CI/Settings/InputSystemSettings.cs @@ -126,7 +126,6 @@ public InputSystemSettings() Wrench.PvpProfilesToCheck = new HashSet() { "supported" }; OverridePackagePlatform(InputSystemPackage); - ExcludeUnsupportedPlatforms(InputSystemPackage); ReadMobileConfig(); @@ -150,19 +149,6 @@ private void OverridePackagePlatform(WrenchPackage package) } } - // MacOs13 jobs are currently failing for Unity 6.6 with "Bad CPU type in executable". - // Remove this once Mac support for 6.6 is confirmed working. - private void ExcludeUnsupportedPlatforms(WrenchPackage package) - { - foreach (UnityEditor unityEditor in package.UnityEditors) - { - if (unityEditor.Version.Version == "6000.6") - { - unityEditor.EditorPlatforms.Items.Remove(EditorPlatformType.MacOs13); - } - } - } - public WrenchSettings Wrench { get; private set; } void ReadMobileConfig() From a82e74938fc61f29ec0e19adeddacee9f5109b03 Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 3 Jun 2026 17:57:26 +0200 Subject: [PATCH 11/12] Don't override MacOs13 agent for Unity 6.6. Wrench 2.12.0 defaults Unity 6.6 to MacOs13Arm. Forcing MacOs13 (Intel) onto it was causing "Bad CPU type in executable" failures on standalone tests. Other editor versions keep the explicit Intel agent override. Co-Authored-By: Claude Sonnet 4.6 --- .../input-system-editor-functional-tests.yml | 18 ----- .../input-system-editor-performance-tests.yml | 18 ----- ...put-system-standalone-functional-tests.yml | 18 ----- ...em-standalone-il2-cpp-functional-tests.yml | 18 ----- ...m-standalone-il2-cpp-performance-tests.yml | 18 ----- ...ut-system-standalone-performance-tests.yml | 18 ----- .yamato/triggers.yml | 6 -- .yamato/wrench/promotion-jobs.yml | 20 ----- .yamato/wrench/validation-jobs.yml | 73 ------------------- Tools/CI/Settings/InputSystemSettings.cs | 10 ++- 10 files changed, 7 insertions(+), 210 deletions(-) diff --git a/.yamato/input-system-editor-functional-tests.yml b/.yamato/input-system-editor-functional-tests.yml index 2a280f9d6c..101f5d659f 100644 --- a/.yamato/input-system-editor-functional-tests.yml +++ b/.yamato/input-system-editor-functional-tests.yml @@ -225,24 +225,6 @@ inputsystem-editorfunctionaltests_-_6000_5_-_win10: paths: - artifacts/**/* -# InputSystem-EditorFunctionalTests - 6000.6 - MacOs13 -inputsystem-editorfunctionaltests_-_6000_6_-_macos13: - name: InputSystem-EditorFunctionalTests - 6000.6 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6_project;flags:inputsystem_MacOS_6000.6_project" --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-EditorFunctionalTests - 6000.6 - MacOs13Arm inputsystem-editorfunctionaltests_-_6000_6_-_macos13arm: name: InputSystem-EditorFunctionalTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-editor-performance-tests.yml b/.yamato/input-system-editor-performance-tests.yml index 6c90331f99..0bec45c78a 100644 --- a/.yamato/input-system-editor-performance-tests.yml +++ b/.yamato/input-system-editor-performance-tests.yml @@ -225,24 +225,6 @@ inputsystem-editorperformancetests_-_6000_5_-_win10: paths: - artifacts/**/* -# InputSystem-EditorPerformanceTests - 6000.6 - MacOs13 -inputsystem-editorperformancetests_-_6000_6_-_macos13: - name: InputSystem-EditorPerformanceTests - 6000.6 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm inputsystem-editorperformancetests_-_6000_6_-_macos13arm: name: InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-standalone-functional-tests.yml b/.yamato/input-system-standalone-functional-tests.yml index b4628abba4..eb5418453a 100644 --- a/.yamato/input-system-standalone-functional-tests.yml +++ b/.yamato/input-system-standalone-functional-tests.yml @@ -225,24 +225,6 @@ inputsystem-standalonefunctionaltests_-_6000_5_-_win10: paths: - artifacts/**/* -# InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13 -inputsystem-standalonefunctionaltests_-_6000_6_-_macos13: - name: InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13Arm inputsystem-standalonefunctionaltests_-_6000_6_-_macos13arm: name: InputSystem-StandaloneFunctionalTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml index d2cf9bf895..caf9b2f085 100644 --- a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml @@ -225,24 +225,6 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_win10: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13 -inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13: - name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=!Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13Arm inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13arm: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml index c135078d95..32aac0545e 100644 --- a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml @@ -225,24 +225,6 @@ inputsystem-standaloneil2cppperformancetests_-_6000_5_-_win10: paths: - artifacts/**/* -# InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13 -inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13: - name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor -c StandaloneSupport-IL2CPP --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --scripting-backend=il2cpp --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13Arm inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13arm: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - MacOs13Arm diff --git a/.yamato/input-system-standalone-performance-tests.yml b/.yamato/input-system-standalone-performance-tests.yml index 0d063d3a04..32f2375c6d 100644 --- a/.yamato/input-system-standalone-performance-tests.yml +++ b/.yamato/input-system-standalone-performance-tests.yml @@ -225,24 +225,6 @@ inputsystem-standaloneperformancetests_-_6000_5_-_win10: paths: - artifacts/**/* -# InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13 -inputsystem-standaloneperformancetests_-_6000_6_-_macos13: - name: InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools - - command: unity-downloader-cli -u trunk -c Editor --fast --wait - - command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=StandaloneOSX --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - artifacts: - paths: - - artifacts/**/* - # InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13Arm inputsystem-standaloneperformancetests_-_6000_6_-_macos13arm: name: InputSystem-StandalonePerformanceTests - 6000.6 - MacOs13Arm diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml index e884c42475..88e2e66977 100644 --- a/.yamato/triggers.yml +++ b/.yamato/triggers.yml @@ -19,7 +19,6 @@ all_functional_tests: - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_macos13 - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu2204 - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_5_-_win10 - - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_macos13 - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_macos13arm - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-editor-functional-tests.yml#inputsystem-editorfunctionaltests_-_6000_6_-_win10 @@ -55,7 +54,6 @@ all_functional_tests: - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_macos13 - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu2204 - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_5_-_win10 - - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_macos13 - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_macos13arm - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-standalone-functional-tests.yml#inputsystem-standalonefunctionaltests_-_6000_6_-_win10 @@ -67,7 +65,6 @@ all_functional_tests: - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_win10 - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_macos13 - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_win10 - - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13 - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_macos13arm - path: .yamato/input-system-standalone-il2-cpp-functional-tests.yml#inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_win10 - path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_inputsystem @@ -93,7 +90,6 @@ all_performance_tests: - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_macos13 - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_ubuntu2204 - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_5_-_win10 - - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_macos13 - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_macos13arm - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-editor-performance-tests.yml#inputsystem-editorperformancetests_-_6000_6_-_win10 @@ -129,7 +125,6 @@ all_performance_tests: - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_macos13 - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu2204 - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_5_-_win10 - - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13 - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_macos13arm - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-standalone-il2-cpp-performance-tests.yml#inputsystem-standaloneil2cppperformancetests_-_6000_6_-_win10 @@ -145,7 +140,6 @@ all_performance_tests: - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_macos13 - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu2204 - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_5_-_win10 - - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_macos13 - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_macos13arm - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu2204 - path: .yamato/input-system-standalone-performance-tests.yml#inputsystem-standaloneperformancetests_-_6000_6_-_win10 diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index e122abf91f..aac7c5fcac 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -151,16 +151,6 @@ publish_dry_run_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.5-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.6-macos13 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.6-macos13 - unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13arm specific_options: packages: @@ -343,16 +333,6 @@ publish_inputsystem: UTR: location: results/UTR/validate-inputsystem-6000.5-win10 unzip: true - - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13 - specific_options: - packages: - ignore_artifact: true - pvp-results: - location: results/pvp/validate-inputsystem-6000.6-macos13 - unzip: true - UTR: - location: results/UTR/validate-inputsystem-6000.6-macos13 - unzip: true - path: .yamato/wrench/validation-jobs.yml#validate_-_inputsystem_-_6000_6_-_macos13arm specific_options: packages: diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index 15cfadd528..b646920748 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -882,79 +882,6 @@ validate_-_inputsystem_-_6000_5_-_win10: labels: - Packages:inputsystem -# PVP Editor and Playmode tests for Validate - inputsystem - 6000.6 - macos13 (6000.6 - MacOS). -validate_-_inputsystem_-_6000_6_-_macos13: - name: Validate - inputsystem - 6000.6 - macos13 - agent: - image: package-ci/macos-13:v4 - type: Unity::VM::osx - flavor: b1.xlarge - commands: - - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip - - command: 7z x -aoa wrench-localapv.zip - - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple - - command: python PythonScripts/print_machine_info.py - - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast - timeout: 20 - retries: 3 - - command: upm-pvp create-test-project test-inputsystem --packages "upm-ci~/packages/*.tgz" --filter "com.unity.inputsystem com.unity.inputsystem.tests" --unity .Editor - timeout: 10 - 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: 20 - retries: 0 - - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 5 - retries: 0 - - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json - timeout: 10 - retries: 0 - - command: UnifiedTestRunner --testproject=test-inputsystem --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6;flags:inputsystem_MacOS_6000.6" --coverage-pkg-version=1.3.0 - timeout: 20 - retries: 1 - after: - - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh - artifacts: - Coverage: - paths: - - upm-ci~/CodeCoverage/** - Crash Dumps: - paths: - - CrashDumps/** - packages: - paths: - - upm-ci~/packages/**/* - pvp-results: - paths: - - upm-ci~/pvp/**/* - browsable: onDemand - UTR: - paths: - - '*.log' - - '*.xml' - - artifacts/**/* - - test-inputsystem/Logs/** - - test-inputsystem/Library/*.log - - test-inputsystem/*.log - - test-inputsystem/Builds/*.log - - build/test-results/** - browsable: onDemand - dependencies: - - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_inputsystem - variables: - UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/ - UNITY_LICENSING_SERVER_DELETE_NUL: 0 - UNITY_LICENSING_SERVER_DELETE_ULF: 0 - UNITY_LICENSING_SERVER_TOOLSET: pro - UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1 - UPMPVP_CONTEXT_WRENCH: 2.12.0.0 - metadata: - Job Maintainers: '#rm-packageworks' - Wrench: 2.12.0.0 - labels: - - Packages:inputsystem - # PVP Editor and Playmode tests for Validate - inputsystem - 6000.6 - macos13arm (6000.6 - MacOS). validate_-_inputsystem_-_6000_6_-_macos13arm: name: Validate - inputsystem - 6000.6 - macos13arm diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs index 09a47e3fe8..1209e492cf 100644 --- a/Tools/CI/Settings/InputSystemSettings.cs +++ b/Tools/CI/Settings/InputSystemSettings.cs @@ -143,9 +143,13 @@ private void OverridePackagePlatform(WrenchPackage package) = new EditorPlatform(EditorPlatformType.Win10, new Agent("package-ci/win10:v4", FlavorType.BuildLarge, ResourceType.Vm)); - unityEditor.EditorPlatforms.Items[EditorPlatformType.MacOs13] - = new EditorPlatform(EditorPlatformType.MacOs13, - new Agent("package-ci/macos-13:v4", FlavorType.BuildExtraLarge, ResourceType.VmOsx)); + // Unity 6.6 defaults to MacOs13Arm in Wrench 2.12.0 — don't override it back to Intel. + if (unityEditor.Version.Version != "6000.6") + { + unityEditor.EditorPlatforms.Items[EditorPlatformType.MacOs13] + = new EditorPlatform(EditorPlatformType.MacOs13, + new Agent("package-ci/macos-13:v4", FlavorType.BuildExtraLarge, ResourceType.VmOsx)); + } } } From b05d0fd2b3a4ac0c6946193ccc167c144e912c6b Mon Sep 17 00:00:00 2001 From: Darren Kelly Date: Wed, 3 Jun 2026 20:50:12 +0200 Subject: [PATCH 12/12] Attempt to fix the flaky Ubuntu tests due to running slow. --- .yamato/input-system-editor-functional-tests.yml | 10 +++++----- .yamato/input-system-editor-performance-tests.yml | 10 +++++----- .yamato/input-system-standalone-functional-tests.yml | 10 +++++----- ...nput-system-standalone-il2-cpp-functional-tests.yml | 10 +++++----- ...put-system-standalone-il2-cpp-performance-tests.yml | 10 +++++----- .yamato/input-system-standalone-performance-tests.yml | 10 +++++----- .yamato/wrench/package-pack-jobs.yml | 2 +- .yamato/wrench/validation-jobs.yml | 10 +++++----- Tools/CI/Settings/InputSystemSettings.cs | 6 ++++++ 9 files changed, 42 insertions(+), 36 deletions(-) diff --git a/.yamato/input-system-editor-functional-tests.yml b/.yamato/input-system-editor-functional-tests.yml index 101f5d659f..228e43a931 100644 --- a/.yamato/input-system-editor-functional-tests.yml +++ b/.yamato/input-system-editor-functional-tests.yml @@ -28,7 +28,7 @@ inputsystem-editorfunctionaltests_-_6000_0_-_ubuntu2204: name: InputSystem-EditorFunctionalTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -83,7 +83,7 @@ inputsystem-editorfunctionaltests_-_6000_3_-_ubuntu2204: name: InputSystem-EditorFunctionalTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -138,7 +138,7 @@ inputsystem-editorfunctionaltests_-_6000_4_-_ubuntu2204: name: InputSystem-EditorFunctionalTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -193,7 +193,7 @@ inputsystem-editorfunctionaltests_-_6000_5_-_ubuntu2204: name: InputSystem-EditorFunctionalTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -249,7 +249,7 @@ inputsystem-editorfunctionaltests_-_6000_6_-_ubuntu2204: name: InputSystem-EditorFunctionalTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools diff --git a/.yamato/input-system-editor-performance-tests.yml b/.yamato/input-system-editor-performance-tests.yml index 0bec45c78a..734df85bb8 100644 --- a/.yamato/input-system-editor-performance-tests.yml +++ b/.yamato/input-system-editor-performance-tests.yml @@ -28,7 +28,7 @@ inputsystem-editorperformancetests_-_6000_0_-_ubuntu2204: name: InputSystem-EditorPerformanceTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -83,7 +83,7 @@ inputsystem-editorperformancetests_-_6000_3_-_ubuntu2204: name: InputSystem-EditorPerformanceTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -138,7 +138,7 @@ inputsystem-editorperformancetests_-_6000_4_-_ubuntu2204: name: InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -193,7 +193,7 @@ inputsystem-editorperformancetests_-_6000_5_-_ubuntu2204: name: InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -249,7 +249,7 @@ inputsystem-editorperformancetests_-_6000_6_-_ubuntu2204: name: InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools diff --git a/.yamato/input-system-standalone-functional-tests.yml b/.yamato/input-system-standalone-functional-tests.yml index eb5418453a..5621e52ce0 100644 --- a/.yamato/input-system-standalone-functional-tests.yml +++ b/.yamato/input-system-standalone-functional-tests.yml @@ -28,7 +28,7 @@ inputsystem-standalonefunctionaltests_-_6000_0_-_ubuntu2204: name: InputSystem-StandaloneFunctionalTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -83,7 +83,7 @@ inputsystem-standalonefunctionaltests_-_6000_3_-_ubuntu2204: name: InputSystem-StandaloneFunctionalTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -138,7 +138,7 @@ inputsystem-standalonefunctionaltests_-_6000_4_-_ubuntu2204: name: InputSystem-StandaloneFunctionalTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -193,7 +193,7 @@ inputsystem-standalonefunctionaltests_-_6000_5_-_ubuntu2204: name: InputSystem-StandaloneFunctionalTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -249,7 +249,7 @@ inputsystem-standalonefunctionaltests_-_6000_6_-_ubuntu2204: name: InputSystem-StandaloneFunctionalTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools diff --git a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml index caf9b2f085..2717a3e872 100644 --- a/.yamato/input-system-standalone-il2-cpp-functional-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-functional-tests.yml @@ -28,7 +28,7 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_0_-_ubuntu2204: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -83,7 +83,7 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_3_-_ubuntu2204: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -138,7 +138,7 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_4_-_ubuntu2204: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -193,7 +193,7 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_5_-_ubuntu2204: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -249,7 +249,7 @@ inputsystem-standaloneil2cppfunctionaltests_-_6000_6_-_ubuntu2204: name: InputSystem-StandaloneIl2CppFunctionalTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools diff --git a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml index 32aac0545e..bdd32fcc7b 100644 --- a/.yamato/input-system-standalone-il2-cpp-performance-tests.yml +++ b/.yamato/input-system-standalone-il2-cpp-performance-tests.yml @@ -28,7 +28,7 @@ inputsystem-standaloneil2cppperformancetests_-_6000_0_-_ubuntu2204: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -83,7 +83,7 @@ inputsystem-standaloneil2cppperformancetests_-_6000_3_-_ubuntu2204: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -138,7 +138,7 @@ inputsystem-standaloneil2cppperformancetests_-_6000_4_-_ubuntu2204: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -193,7 +193,7 @@ inputsystem-standaloneil2cppperformancetests_-_6000_5_-_ubuntu2204: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -249,7 +249,7 @@ inputsystem-standaloneil2cppperformancetests_-_6000_6_-_ubuntu2204: name: InputSystem-StandaloneIl2CppPerformanceTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools diff --git a/.yamato/input-system-standalone-performance-tests.yml b/.yamato/input-system-standalone-performance-tests.yml index 32f2375c6d..7282f23b9b 100644 --- a/.yamato/input-system-standalone-performance-tests.yml +++ b/.yamato/input-system-standalone-performance-tests.yml @@ -28,7 +28,7 @@ inputsystem-standaloneperformancetests_-_6000_0_-_ubuntu2204: name: InputSystem-StandalonePerformanceTests - 6000.0 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -83,7 +83,7 @@ inputsystem-standaloneperformancetests_-_6000_3_-_ubuntu2204: name: InputSystem-StandalonePerformanceTests - 6000.3 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -138,7 +138,7 @@ inputsystem-standaloneperformancetests_-_6000_4_-_ubuntu2204: name: InputSystem-StandalonePerformanceTests - 6000.4 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -193,7 +193,7 @@ inputsystem-standaloneperformancetests_-_6000_5_-_ubuntu2204: name: InputSystem-StandalonePerformanceTests - 6000.5 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools @@ -249,7 +249,7 @@ inputsystem-standaloneperformancetests_-_6000_6_-_ubuntu2204: name: InputSystem-StandalonePerformanceTests - 6000.6 - Ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index b319f03d3b..9e3cb33b58 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -11,7 +11,7 @@ package_pack_-_inputsystem: name: Package Pack - inputsystem agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index b646920748..3ab37d1487 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -84,7 +84,7 @@ validate_-_inputsystem_-_6000_0_-_ubuntu2204: name: Validate - inputsystem - 6000.0 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip @@ -303,7 +303,7 @@ validate_-_inputsystem_-_6000_3_-_ubuntu2204: name: Validate - inputsystem - 6000.3 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip @@ -522,7 +522,7 @@ validate_-_inputsystem_-_6000_4_-_ubuntu2204: name: Validate - inputsystem - 6000.4 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip @@ -741,7 +741,7 @@ validate_-_inputsystem_-_6000_5_-_ubuntu2204: name: Validate - inputsystem - 6000.5 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip @@ -961,7 +961,7 @@ validate_-_inputsystem_-_6000_6_-_ubuntu2204: name: Validate - inputsystem - 6000.6 - ubuntu2204 agent: image: package-ci/ubuntu-22.04:v4 - type: Unity::VM + type: Unity::VM::GPU flavor: b1.large commands: - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs index 1209e492cf..9293eb4ca0 100644 --- a/Tools/CI/Settings/InputSystemSettings.cs +++ b/Tools/CI/Settings/InputSystemSettings.cs @@ -135,6 +135,8 @@ public InputSystemSettings() // Default FlavorType was changed for Win & Mac in Wrench 2.0. // Overriding this to keep them the same esp. for performance jobs. + // Ubuntu2204 is overridden to use a GPU VM to avoid software rendering slowdowns + // when running standalone player tests. private void OverridePackagePlatform(WrenchPackage package) { foreach (UnityEditor unityEditor in package.UnityEditors) @@ -150,6 +152,10 @@ private void OverridePackagePlatform(WrenchPackage package) = new EditorPlatform(EditorPlatformType.MacOs13, new Agent("package-ci/macos-13:v4", FlavorType.BuildExtraLarge, ResourceType.VmOsx)); } + + unityEditor.EditorPlatforms.Items[EditorPlatformType.Ubuntu2204] + = new EditorPlatform(EditorPlatformType.Ubuntu2204, + new Agent("package-ci/ubuntu-22.04:v4", FlavorType.BuildLarge, ResourceType.VmGpu)); } }