From 2e14617a920b569c7fd8530bdd8946f471c99433 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 19 Feb 2025 13:28:04 +0100
Subject: [PATCH 01/20] split performance tests from code coverage for windows

---
 .yamato/upm-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index e07e3e9d0d..2ae3fff38b 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -26,7 +26,7 @@
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     # Run upm-ci verification tests as well as tests contained in the package.
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u %EDITOR_VERSION%
-      {% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
+      {% if platform.name == "win" and category.name != "performance" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
       --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}
@@ -37,9 +37,9 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if platform.name == "win" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
+    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} {% if category.name == "all" %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name != "performance %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
     # Merge all the code coverage results into one report.
-    {% if platform.name == "win" %}
+    {% if platform.name == "win" and category.name != "performance" %}
     - '{{ yamato_source_dir_win }}/.Editor/Unity.exe -projectPath {{ yamato_source_dir_win }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem/" -quit' 
     #delete the reports from the two runs and only keep the final merged one
     - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"

From 923a5762165094628c5d28178fb86e18e4ca54d1 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 19 Feb 2025 13:32:50 +0100
Subject: [PATCH 02/20] Revert "split performance tests from code coverage for
 windows"

This reverts commit 2e14617a920b569c7fd8530bdd8946f471c99433.
---
 .yamato/upm-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 2ae3fff38b..e07e3e9d0d 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -26,7 +26,7 @@
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     # Run upm-ci verification tests as well as tests contained in the package.
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u %EDITOR_VERSION%
-      {% if platform.name == "win" and category.name != "performance" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
+      {% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
       --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}
@@ -37,9 +37,9 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} {% if category.name == "all" %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name != "performance %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
+    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if platform.name == "win" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
     # Merge all the code coverage results into one report.
-    {% if platform.name == "win" and category.name != "performance" %}
+    {% if platform.name == "win" %}
     - '{{ yamato_source_dir_win }}/.Editor/Unity.exe -projectPath {{ yamato_source_dir_win }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem/" -quit' 
     #delete the reports from the two runs and only keep the final merged one
     - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"

From 5cd9079d686ae27ce433e0db7020d15eb6688090 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 19 Feb 2025 13:35:29 +0100
Subject: [PATCH 03/20] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index e07e3e9d0d..b8d7bb247a 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -26,7 +26,7 @@
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     # Run upm-ci verification tests as well as tests contained in the package.
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u %EDITOR_VERSION%
-      {% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
+      {% if platform.name == "win" and category.name != "performance" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
       --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}

From 2128ee0d0c0c61907ad5da2264021030249165e7 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 19 Feb 2025 13:36:55 +0100
Subject: [PATCH 04/20] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index b8d7bb247a..d7549f27e8 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -37,7 +37,7 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if platform.name == "win" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
+    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} {% if category.name == "all" %} --category=!Performance {% endif %}--api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if platform.name == "win" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
     # Merge all the code coverage results into one report.
     {% if platform.name == "win" %}
     - '{{ yamato_source_dir_win }}/.Editor/Unity.exe -projectPath {{ yamato_source_dir_win }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem/" -quit' 

From f943a0db2c20fadbd05421d7f95d8c402e365221 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 19 Feb 2025 13:38:43 +0100
Subject: [PATCH 05/20] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index d7549f27e8..6f295fb376 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -37,7 +37,7 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} {% if category.name == "all" %} --category=!Performance {% endif %}--api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if platform.name == "win" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
+    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} {% if category.name == "all" %} --category=!Performance {% endif %}--api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name != "performance" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
     # Merge all the code coverage results into one report.
     {% if platform.name == "win" %}
     - '{{ yamato_source_dir_win }}/.Editor/Unity.exe -projectPath {{ yamato_source_dir_win }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem/" -quit' 

From 51e01bdd654e9b7412804c3ef828270a42ff997a Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 19 Feb 2025 13:39:59 +0100
Subject: [PATCH 06/20] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 6f295fb376..658f2bcffe 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -39,7 +39,7 @@
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} {% if category.name == "all" %} --category=!Performance {% endif %}--api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name != "performance" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
     # Merge all the code coverage results into one report.
-    {% if platform.name == "win" %}
+    {% if platform.name == "win" and category.name != "performance" %}
     - '{{ yamato_source_dir_win }}/.Editor/Unity.exe -projectPath {{ yamato_source_dir_win }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem/" -quit' 
     #delete the reports from the two runs and only keep the final merged one
     - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"

From 6865ccc225a166a8a4e0df03c534f324d572e235 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 19 Feb 2025 20:42:49 +0100
Subject: [PATCH 07/20] split for all remaining tests

---
 .yamato/config.metadata |  2 +-
 .yamato/upm-ci.yml      | 36 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.yamato/config.metadata b/.yamato/config.metadata
index d1acdd6760..6e6645d006 100644
--- a/.yamato/config.metadata
+++ b/.yamato/config.metadata
@@ -80,7 +80,7 @@ ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0
 
 test_category: 
   - name: performance
-  - name: all
+  - name: functional
   
 instabilities_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0
 instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0
diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 658f2bcffe..380af2b1f0 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -26,7 +26,7 @@
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     # Run upm-ci verification tests as well as tests contained in the package.
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u %EDITOR_VERSION%
-      {% if platform.name == "win" and category.name != "performance" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
+      {% if platform.name == "win" and category.name == "functional" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
       --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}
@@ -37,9 +37,9 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} {% if category.name == "all" %} --category=!Performance {% endif %}--api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name != "performance" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
+    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name == "functional" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
     # Merge all the code coverage results into one report.
-    {% if platform.name == "win" and category.name != "performance" %}
+    {% if platform.name == "win" and category.name == "functional" %}
     - '{{ yamato_source_dir_win }}/.Editor/Unity.exe -projectPath {{ yamato_source_dir_win }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem/" -quit' 
     #delete the reports from the two runs and only keep the final merged one
     - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"
@@ -77,7 +77,7 @@
     - mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     # Run upm-ci verification tests as well as tests contained in the package.
-    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u $EDITOR_VERSION {% if platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
+    - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u $EDITOR_VERSION {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}
     - {{ platform.installscript }} $EDITOR_VERSION
@@ -87,12 +87,12 @@
     - mv ./Packages/com.unity.inputsystem/Samples ./Assets
     - mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
+    - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
     # Merge all the code coverage results into one report.
-    {% if platform.name == "mac" %}
+    {% if platform.name == "mac" and category.name == "functional %}
     - '{{ yamato_source_dir_nix }}/.Editor/Unity.app/Contents/MacOS/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit' 
     {% endif %}
-    {% if platform.name == "linux" %}
+    {% if platform.name == "linux" and category.name == "functional %}
     - '{{ yamato_source_dir_nix }}/.Editor/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit' 
     {% endif %}
     - rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package
@@ -122,7 +122,7 @@ build_ios_{{ editor.version }}_{{ category.name }}:
     - {{ utr_install_nix }}
     - {{ unity_downloader_install }}
     - unity-downloader-cli -c Editor -c iOS -u $EDITOR_VERSION --fast --wait
-    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
+    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
   after:
     - {{ instabilities_install_nix }}
     - {{ instabilities_run_mac }}
@@ -148,7 +148,7 @@ run_ios_{{ editor.version }}_{{ category.name }}:
     - .yamato/upm-ci.yml#build_ios_{{ editor.version }}_{{ category.name }}
   commands:
     - {{ utr_install_nix }}
-    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem 
+    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
   after:
     - {{ instabilities_install_nix }}
     - {{ instabilities_run_mac }}
@@ -170,7 +170,7 @@ build_tvos_{{ editor.version }}:
     - {{ utr_install_nix }}
     - {{ unity_downloader_install }}
     - unity-downloader-cli -c Editor -c AppleTV -u $EDITOR_VERSION --fast --wait
-    - ./utr --suite=playmode --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only --report-performance-data --performance-project-id=InputSystem
+    - ./utr --suite=playmode --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
   after:
     - {{ instabilities_install_nix }}
     - {{ instabilities_run_mac }}
@@ -195,7 +195,7 @@ run_tvos_{{ editor.version }}:
     - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}
   commands:
     - {{ utr_install_nix }}
-    - ./utr --suite=playmode --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem
+    - ./utr --suite=playmode --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
   after:
     - {{ instabilities_install_nix }}
     - {{ instabilities_run_mac }}
@@ -218,7 +218,7 @@ build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
     - {{ utr_install_win }}
     - {{ unity_downloader_install }}
     - unity-downloader-cli -c Editor -c Android -u %EDITOR_VERSION% --fast --wait
-    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository --performance-project-id=InputSystem
+    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository {% if category.name == "performance" %} --performance-project-id=InputSystem {% endif %}
   after:
     - {{ instabilities_install_win }}
     - {{ instabilities_run_win }}  
@@ -252,7 +252,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
        start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
        # List the connected devices
        start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
-       ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% endif %} --platform=android --player-load-path=build/players --artifacts_path=build/test-results --report-performance-data --performance-project-id=InputSystem
+       ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=android --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
   after:
     - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
     - if not exist build\test-results mkdir build\test-results
@@ -269,19 +269,19 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
 {% endfor %} # editors
 
 all_tests:
-  name: All Tests
+  name: Functional Tests
   dependencies:
     {% for editor in editors %}
     {% for platform in platforms_win %}
-    - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }}_all
+    - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }}_functional
     {% endfor %}
     {% for platform in platforms_nix %}
-    - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }}_all
+    - .yamato/upm-ci.yml#{{ platform.name }}_{{ editor.version }}_functional
     {% endfor %}
     {% for backend in scripting_backends %}
-    - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_all
+    - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_functional
     {% endfor %}
-    - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_all
+    - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_functional
 {% if editor.disable_tvos_run %}
     - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}
 {% else %}

From 018998fb38a56e9a9ba6e9d1fa0533683f4f43f7 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 11:44:49 +0100
Subject: [PATCH 08/20] found the missing "

---
 .yamato/upm-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 380af2b1f0..93b1ba98f5 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -89,10 +89,10 @@
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
     # Merge all the code coverage results into one report.
-    {% if platform.name == "mac" and category.name == "functional %}
+    {% if platform.name == "mac" and category.name == "functional" %}
     - '{{ yamato_source_dir_nix }}/.Editor/Unity.app/Contents/MacOS/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit' 
     {% endif %}
-    {% if platform.name == "linux" and category.name == "functional %}
+    {% if platform.name == "linux" and category.name == "functional" %}
     - '{{ yamato_source_dir_nix }}/.Editor/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit' 
     {% endif %}
     - rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package

From c5629a2d85276fbaf60a81b1a28d1e654d056524 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 11:46:53 +0100
Subject: [PATCH 09/20] rename jobs to move to the top of yamato list

---
 .yamato/upm-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 93b1ba98f5..51faee2450 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -269,7 +269,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
 {% endfor %} # editors
 
 all_tests:
-  name: Functional Tests
+  name: All Functional Tests
   dependencies:
     {% for editor in editors %}
     {% for platform in platforms_win %}
@@ -298,7 +298,7 @@ all_tests:
             
             
 performance_tests_only:
-  name: Performance Tests Only
+  name: All Performance Tests Only
   dependencies:
     {% for editor in editors %}
     {% for platform in platforms_win %}

From e012eb8f21757d984b2ce11d521b580de4453864 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 13:14:41 +0100
Subject: [PATCH 10/20] consistent naming

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 51faee2450..3a77731d08 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -298,7 +298,7 @@ all_tests:
             
             
 performance_tests_only:
-  name: All Performance Tests Only
+  name: All Performance Tests
   dependencies:
     {% for editor in editors %}
     {% for platform in platforms_win %}

From 2ada5aca8c90fd56fee791a6c9600bbdb5e8f8ca Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 13:18:15 +0100
Subject: [PATCH 11/20] more naming consistency

---
 .yamato/upm-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 3a77731d08..d8f3bf5fb8 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -159,7 +159,7 @@ run_ios_{{ editor.version }}_{{ category.name }}:
 {% endfor %} # test_category
 
 build_tvos_{{ editor.version }}:
-  name: Build - {{ editor.version }} - tvOS
+  name: Build - {{ editor.version }} - tvOS, {{ category.name }} tests
   agent:
     type: Unity::VM::osx
     image: {{ ios_and_tvos_macos_bokken_image }}
@@ -183,7 +183,7 @@ build_tvos_{{ editor.version }}:
           - "build/logs/**"
 
 run_tvos_{{ editor.version }}:
-  name: Run - {{ editor.version }} - tvOS
+  name: Run - {{ editor.version }} - tvOS, {{ category.name }} tests
   agent:
       type: Unity::mobile::appletv
       image: {{ ios_and_tvos_macos_bokken_image }}

From df603a716d9066fc1272a6935d16b552e385ef19 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 13:21:38 +0100
Subject: [PATCH 12/20] tvOS category split

---
 .yamato/upm-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index d8f3bf5fb8..637e570f28 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -170,7 +170,7 @@ build_tvos_{{ editor.version }}:
     - {{ utr_install_nix }}
     - {{ unity_downloader_install }}
     - unity-downloader-cli -c Editor -c AppleTV -u $EDITOR_VERSION --fast --wait
-    - ./utr --suite=playmode --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
+    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
   after:
     - {{ instabilities_install_nix }}
     - {{ instabilities_run_mac }}
@@ -195,7 +195,7 @@ run_tvos_{{ editor.version }}:
     - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}
   commands:
     - {{ utr_install_nix }}
-    - ./utr --suite=playmode --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
+    - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
   after:
     - {{ instabilities_install_nix }}
     - {{ instabilities_run_mac }}

From dada7ece14ba649512d1f554dd63c23378fe51a1 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 13:25:24 +0100
Subject: [PATCH 13/20] more tvOS fixes

---
 .yamato/upm-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 637e570f28..86b523b4f0 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -158,7 +158,7 @@ run_ios_{{ editor.version }}_{{ category.name }}:
           - "build/test-results/**"
 {% endfor %} # test_category
 
-build_tvos_{{ editor.version }}:
+build_tvos_{{ editor.version }}_{{ category.name }}:
   name: Build - {{ editor.version }} - tvOS, {{ category.name }} tests
   agent:
     type: Unity::VM::osx
@@ -182,7 +182,7 @@ build_tvos_{{ editor.version }}:
         paths:
           - "build/logs/**"
 
-run_tvos_{{ editor.version }}:
+run_tvos_{{ editor.version }}_{{ category.name }}:
   name: Run - {{ editor.version }} - tvOS, {{ category.name }} tests
   agent:
       type: Unity::mobile::appletv
@@ -192,7 +192,7 @@ run_tvos_{{ editor.version }}:
     EDITOR_VERSION: {{ editor.version }}
   skip_checkout: true
   dependencies:
-    - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}
+    - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_{{ category.name }}
   commands:
     - {{ utr_install_nix }}
     - ./utr --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}

From 479f8168d47fa32ecf7f88f924ee3be8fd84d622 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 13:30:24 +0100
Subject: [PATCH 14/20] yet more tvOS fixes

---
 .yamato/upm-ci.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 86b523b4f0..66bab9b0d3 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -283,9 +283,9 @@ all_tests:
     {% endfor %}
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_functional
 {% if editor.disable_tvos_run %}
-    - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}
+    - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_functional
 {% else %}
-    - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}
+    - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_functional
 {% endif %}
     {% endfor %}
     - .yamato/upm-ci.yml#publish_dryrun
@@ -311,7 +311,12 @@ performance_tests_only:
     - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_performance
     {% endfor %}
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_performance
-    {% endfor %}
+    {% if editor.disable_tvos_run %}
+    - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_performance
+    {% else %}
+    - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_performance
+    {% endif %}
+    {% endfor %} #editors
   triggers:
     recurring:
         - branch: develop

From 45714d74703ae4c7d56ec3a3b14cb672efaa0265 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 13:33:47 +0100
Subject: [PATCH 15/20] tvOS functional performance split for All Runs

---
 .yamato/config.metadata | 12 ++++++++----
 .yamato/upm-ci.yml      |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.yamato/config.metadata b/.yamato/config.metadata
index 6e6645d006..54a4cd0337 100644
--- a/.yamato/config.metadata
+++ b/.yamato/config.metadata
@@ -1,13 +1,17 @@
 editors:
   - version: 2021.3
   - version: 2022.3
-    disable_tvos_run: true
+    disable_tvos_run_functional: true
+    disable_tvos_run_performance: false
   - version: 6000.0
-    disable_tvos_run: true
+    disable_tvos_run_functional: true
+    disable_tvos_run_performance: false
   - version: 6000.1
-    disable_tvos_run: true
+    disable_tvos_run_functional: true
+    disable_tvos_run_performance: false
   - version: trunk
-    disable_tvos_run: true
+    disable_tvos_run_functional: true
+    disable_tvos_run_performance: false
 
 utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
 utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 66bab9b0d3..4b95d242d1 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -282,7 +282,7 @@ all_tests:
     - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_functional
     {% endfor %}
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_functional
-{% if editor.disable_tvos_run %}
+{% if editor.disable_tvos_run_functional %}
     - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_functional
 {% else %}
     - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_functional
@@ -311,7 +311,7 @@ performance_tests_only:
     - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_performance
     {% endfor %}
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_performance
-    {% if editor.disable_tvos_run %}
+    {% if editor.disable_tvos_run_performance %}
     - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_performance
     {% else %}
     - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_performance

From 4dcd6c285fd09b68f95d25bfd98ba20f982a337b Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 13:36:37 +0100
Subject: [PATCH 16/20] you'll never guess: more tvOS fixes

---
 .yamato/upm-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 4b95d242d1..2640e47e0e 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -156,7 +156,6 @@ run_ios_{{ editor.version }}_{{ category.name }}:
     logs:
         paths:
           - "build/test-results/**"
-{% endfor %} # test_category
 
 build_tvos_{{ editor.version }}_{{ category.name }}:
   name: Build - {{ editor.version }} - tvOS, {{ category.name }} tests
@@ -205,7 +204,6 @@ run_tvos_{{ editor.version }}_{{ category.name }}:
           - "build/test-results/**"
 
 {% for backend in scripting_backends %}
-{% for category in test_category %}
 build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
   name: Build - {{ editor.version }} - Android {{ backend.name }}, {{ category.name }} tests
   agent:
@@ -265,6 +263,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
       paths:
         - "build/test-results/**"
 {% endfor %} # test_category
+
 {% endfor %} # scripting_backends
 {% endfor %} # editors
 

From cfa06eab9d95bb54bf299703d2cd7d95b25a5095 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 13:39:32 +0100
Subject: [PATCH 17/20] Revert "you'll never guess: more tvOS fixes"

This reverts commit 4dcd6c285fd09b68f95d25bfd98ba20f982a337b.
---
 .yamato/upm-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 2640e47e0e..4b95d242d1 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -156,6 +156,7 @@ run_ios_{{ editor.version }}_{{ category.name }}:
     logs:
         paths:
           - "build/test-results/**"
+{% endfor %} # test_category
 
 build_tvos_{{ editor.version }}_{{ category.name }}:
   name: Build - {{ editor.version }} - tvOS, {{ category.name }} tests
@@ -204,6 +205,7 @@ run_tvos_{{ editor.version }}_{{ category.name }}:
           - "build/test-results/**"
 
 {% for backend in scripting_backends %}
+{% for category in test_category %}
 build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
   name: Build - {{ editor.version }} - Android {{ backend.name }}, {{ category.name }} tests
   agent:
@@ -263,7 +265,6 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
       paths:
         - "build/test-results/**"
 {% endfor %} # test_category
-
 {% endfor %} # scripting_backends
 {% endfor %} # editors
 

From 065e536d07e26b3bee94ed5cd584c171624a1e24 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 15:48:59 +0100
Subject: [PATCH 18/20] tvOS

---
 .yamato/config.metadata | 16 ++++++++--------
 .yamato/upm-ci.yml      | 16 +++++++---------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.yamato/config.metadata b/.yamato/config.metadata
index 54a4cd0337..924d6a929d 100644
--- a/.yamato/config.metadata
+++ b/.yamato/config.metadata
@@ -1,17 +1,17 @@
 editors:
   - version: 2021.3
   - version: 2022.3
-    disable_tvos_run_functional: true
-    disable_tvos_run_performance: false
+    tvos_run_functional: false
+    tvos_run_performance: true
   - version: 6000.0
-    disable_tvos_run_functional: true
-    disable_tvos_run_performance: false
+    tvos_run_functional: false
+    tvos_run_performance: true
   - version: 6000.1
-    disable_tvos_run_functional: true
-    disable_tvos_run_performance: false
+    tvos_run_functional: false
+    tvos_run_performance: true
   - version: trunk
-    disable_tvos_run_functional: true
-    disable_tvos_run_performance: false
+    tvos_run_functional: false
+    tvos_run_performance: true
 
 utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
 utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 4b95d242d1..2543fe4678 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -156,7 +156,6 @@ run_ios_{{ editor.version }}_{{ category.name }}:
     logs:
         paths:
           - "build/test-results/**"
-{% endfor %} # test_category
 
 build_tvos_{{ editor.version }}_{{ category.name }}:
   name: Build - {{ editor.version }} - tvOS, {{ category.name }} tests
@@ -203,6 +202,7 @@ run_tvos_{{ editor.version }}_{{ category.name }}:
     logs:
         paths:
           - "build/test-results/**"
+{% endfor %} # test_category
 
 {% for backend in scripting_backends %}
 {% for category in test_category %}
@@ -282,11 +282,11 @@ all_tests:
     - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_functional
     {% endfor %}
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_functional
-{% if editor.disable_tvos_run_functional %}
+    {% if editor.tvos_run_functional == "false" %}
     - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_functional
-{% else %}
+    {% else %}
     - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_functional
-{% endif %}
+    {% endif %}
     {% endfor %}
     - .yamato/upm-ci.yml#publish_dryrun
   triggers:
@@ -311,11 +311,9 @@ performance_tests_only:
     - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_performance
     {% endfor %}
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_performance
-    {% if editor.disable_tvos_run_performance %}
-    - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_performance
-    {% else %}
-    - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_performance
-    {% endif %}
+    {% unless editor.tvos_run_performance == "true" %}
+    - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_performance    
+    {% endunless %}
     {% endfor %} #editors
   triggers:
     recurring:

From cb925f7fbf066b04935f127398d09bef67ab8ee2 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 20:32:43 +0100
Subject: [PATCH 19/20] fix wrong logic

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 2543fe4678..eedd64d950 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -311,7 +311,7 @@ performance_tests_only:
     - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_performance
     {% endfor %}
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_performance
-    {% unless editor.tvos_run_performance == "true" %}
+    {% unless editor.tvos_run_performance == "false" %}
     - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_performance    
     {% endunless %}
     {% endfor %} #editors

From a2abf416e357ad55ce82e52b5e1f6b07ad48cbf0 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 20 Feb 2025 21:02:36 +0100
Subject: [PATCH 20/20] revert split func & perf variable for tvOS

---
 .yamato/config.metadata | 12 ++++--------
 .yamato/upm-ci.yml      |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.yamato/config.metadata b/.yamato/config.metadata
index 924d6a929d..565df3b2ac 100644
--- a/.yamato/config.metadata
+++ b/.yamato/config.metadata
@@ -1,17 +1,13 @@
 editors:
   - version: 2021.3
   - version: 2022.3
-    tvos_run_functional: false
-    tvos_run_performance: true
+    run_tvos: false
   - version: 6000.0
-    tvos_run_functional: false
-    tvos_run_performance: true
+    run_tvos: false
   - version: 6000.1
-    tvos_run_functional: false
-    tvos_run_performance: true
+    run_tvos: false
   - version: trunk
-    tvos_run_functional: false
-    tvos_run_performance: true
+    run_tvos: false    
 
 utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
 utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index eedd64d950..95eead5b5e 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -282,7 +282,7 @@ all_tests:
     - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_functional
     {% endfor %}
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_functional
-    {% if editor.tvos_run_functional == "false" %}
+    {% if editor.run_tvos == "false" %}
     - .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_functional
     {% else %}
     - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_functional
@@ -311,7 +311,7 @@ performance_tests_only:
     - .yamato/upm-ci.yml#run_android_{{ editor.version }}_{{ backend.name }}_performance
     {% endfor %}
     - .yamato/upm-ci.yml#run_ios_{{ editor.version }}_performance
-    {% unless editor.tvos_run_performance == "false" %}
+    {% unless editor.run_tvos == "false" %}
     - .yamato/upm-ci.yml#run_tvos_{{ editor.version }}_performance    
     {% endunless %}
     {% endfor %} #editors