From 3ee8a9b6eb13dfc14ccb94a40135c8290ed8f765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Chrobot?= Date: Fri, 8 May 2026 13:10:21 +0200 Subject: [PATCH 1/5] Added pnnedTrunk jobs and adjusted PR trigger --- .yamato/_run-all.yml | 89 +++++++++++++++++++++++++++++++++++++--- .yamato/_triggers.yml | 8 ++-- .yamato/project.metafile | 3 ++ 3 files changed, 90 insertions(+), 10 deletions(-) diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index b62d4ae8a3..1aa1dfc83c 100644 --- a/.yamato/_run-all.yml +++ b/.yamato/_run-all.yml @@ -37,7 +37,15 @@ run_all_package_tests_trunk: name: Run All Package Tests [Trunk only] dependencies: {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} + - .yamato/package-tests.yml#package_test_-_ngo_trunk_{{ platform.name }} +{% endfor -%} + +# Runs all package tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures) +run_all_package_tests_pinnedTrunk: + name: Run All Package Tests [Pinned Trunk only] + dependencies: +{% for platform in test_platforms.desktop -%} +{% for editor in validation_editors.pinnedTrunk -%} - .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }} {% endfor -%} {% endfor -%} @@ -73,7 +81,19 @@ run_all_project_tests_trunk: {% for project in projects.all -%} {% if project.has_tests == "true" -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} + - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_trunk +{% endfor -%} +{% endif -%} +{% endfor -%} + +# Runs all projects tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures) +run_all_project_tests_pinnedTrunk: + name: Run All Project Tests [Pinned Trunk only] + dependencies: +{% for project in projects.all -%} +{% if project.has_tests == "true" -%} +{% for platform in test_platforms.desktop -%} +{% for editor in validation_editors.pinnedTrunk -%} - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }} {% endfor -%} {% endfor -%} @@ -125,7 +145,18 @@ run_all_webgl_builds_trunk: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} + - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_trunk +{% endfor -%} +{% endfor -%} + + +# Runs all WebGL builds on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures) +run_all_webgl_builds_pinnedTrunk: + name: Run All WebGl Build [Pinned Trunk only] + dependencies: +{% for project in projects.default -%} +{% for platform in test_platforms.desktop -%} +{% for editor in validation_editors.pinnedTrunk -%} - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }} {% endfor -%} {% endfor -%} @@ -163,8 +194,20 @@ run_all_project_tests_desktop_standalone_trunk: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.default -%} {% for backend in scripting_backends -%} + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_trunk +{% endfor -%} +{% endfor -%} +{% endfor -%} + +# Runs all Desktop tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures) +run_all_project_tests_desktop_standalone_pinnedTrunk: + name: Run All Standalone Tests - Desktop [Pinned Trunk only] + dependencies: +{% for project in projects.default -%} +{% for platform in test_platforms.desktop -%} +{% for backend in scripting_backends -%} +{% for editor in validation_editors.pinnedTrunk -%} - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }} {% endfor -%} {% endfor -%} @@ -202,7 +245,17 @@ run_all_project_tests_mobile_standalone_trunk: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.mobile_test -%} -{% for editor in validation_editors.default -%} + - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_trunk +{% endfor -%} +{% endfor -%} + +# Runs all Mobile tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures) +run_all_project_tests_mobile_standalone_pinnedTrunk: + name: Run All Standalone Tests - Mobile [Pinned Trunk only] + dependencies: +{% for project in projects.default -%} +{% for platform in test_platforms.mobile_test -%} +{% for editor in validation_editors.pinnedTrunk -%} - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }} {% endfor -%} {% endfor -%} @@ -238,7 +291,17 @@ run_all_project_tests_console_standalone_trunk: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.console_test -%} -{% for editor in validation_editors.default -%} + - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_trunk +{% endfor -%} +{% endfor -%} + +# Runs all Console tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures) +run_all_project_tests_console_standalone_pinnedTrunk: + name: Run All Standalone Tests - Console [Pinned Trunk only] + dependencies: +{% for project in projects.default -%} +{% for platform in test_platforms.console_test -%} +{% for editor in validation_editors.pinnedTrunk -%} - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }} {% endfor -%} {% endfor -%} @@ -281,6 +344,20 @@ run_all_project_tests_cmb_service_trunk: {% endfor -%} {% endfor -%} +# Runs all CMB service tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures) +run_all_project_tests_cmb_service_pinnedTrunk: + name: Run All CMB Service Tests [Pinned Trunk only] + dependencies: +{% for project in projects.default -%} +{% for platform in test_platforms.default -%} +{% for backend in scripting_backends -%} +{% for editor in validation_editors.pinnedTrunk -%} + - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }} +{% endfor -%} +{% endfor -%} +{% endfor -%} +{% endfor -%} + # Runs all CMB service tests on mimimum supported editor (6000.0 in case of NGOv2.X) run_all_project_tests_cmb_service_6000: name: Run All CMB Service Tests [6000.0] diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index d51d6b3940..668ad65ae5 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -76,19 +76,19 @@ pr_code_changes_checks: - .yamato/vetting-test.yml#vetting_test # Run package EditMode and Playmode package tests on trunk and an older supported editor (6000.0) - - .yamato/package-tests.yml#package_test_-_ngo_trunk_mac + - .yamato/package-tests.yml#package_test_-_ngo_pinnedTrunk_mac - .yamato/package-tests.yml#package_test_-_ngo_6000.0_win # Run testproject EditMode and Playmode project tests on trunk and an older supported editor (6000.0) - - .yamato/project-tests.yml#test_testproject_win_trunk + - .yamato/project-tests.yml#test_testproject_win_pinnedTrunk - .yamato/project-tests.yml#test_testproject_mac_6000.0 # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs # desktop_standalone_test and cmb_service_standalone_test are both reusing desktop_standalone_build dependency so we run those in the same configuration on PRs to reduce waiting time. # Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk - - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_pinnedTrunk + - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_pinnedTrunk triggers: expression: |- (pull_request.comment eq "ngo" OR diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 1c3037a322..a3ceb884fc 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -181,8 +181,11 @@ validation_editors: - 6000.4 - 6000.5 - trunk + - 77e2e2eea1be7153f85edac158fd663828839731 minimal: - 6000.0 + pinnedTrunk: + - 77e2e2eea1be7153f85edac158fd663828839731 # Scripting backends used by Standalone RunTimeTests--------------------------------------------------- From b69a505c82e1f2002cd1dee264601d10c825a832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Chrobot?= Date: Fri, 8 May 2026 13:17:17 +0200 Subject: [PATCH 2/5] correction of metafile setup --- .yamato/_run-all.yml | 28 +++++++--------------------- .yamato/project.metafile | 3 +-- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index 1aa1dfc83c..24daf40665 100644 --- a/.yamato/_run-all.yml +++ b/.yamato/_run-all.yml @@ -45,9 +45,7 @@ run_all_package_tests_pinnedTrunk: name: Run All Package Tests [Pinned Trunk only] dependencies: {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.pinnedTrunk -%} - - .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }} -{% endfor -%} + - .yamato/package-tests.yml#package_test_-_ngo_{{ pinnedTrunk }}_{{ platform.name }} {% endfor -%} # Runs all package tests on mimimum supported editor (6000.0 in case of NGOv2.X) @@ -93,9 +91,7 @@ run_all_project_tests_pinnedTrunk: {% for project in projects.all -%} {% if project.has_tests == "true" -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.pinnedTrunk -%} - - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }} {% endfor -%} {% endif -%} {% endfor -%} @@ -156,9 +152,7 @@ run_all_webgl_builds_pinnedTrunk: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} -{% for editor in validation_editors.pinnedTrunk -%} - - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }} {% endfor -%} {% endfor -%} @@ -207,9 +201,7 @@ run_all_project_tests_desktop_standalone_pinnedTrunk: {% for project in projects.default -%} {% for platform in test_platforms.desktop -%} {% for backend in scripting_backends -%} -{% for editor in validation_editors.pinnedTrunk -%} - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }} -{% endfor -%} + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ pinnedTrunk }} {% endfor -%} {% endfor -%} {% endfor -%} @@ -255,9 +247,7 @@ run_all_project_tests_mobile_standalone_pinnedTrunk: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.mobile_test -%} -{% for editor in validation_editors.pinnedTrunk -%} - - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }} {% endfor -%} {% endfor -%} @@ -301,9 +291,7 @@ run_all_project_tests_console_standalone_pinnedTrunk: dependencies: {% for project in projects.default -%} {% for platform in test_platforms.console_test -%} -{% for editor in validation_editors.pinnedTrunk -%} - - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }} -{% endfor -%} + - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }} {% endfor -%} {% endfor -%} @@ -351,9 +339,7 @@ run_all_project_tests_cmb_service_pinnedTrunk: {% for project in projects.default -%} {% for platform in test_platforms.default -%} {% for backend in scripting_backends -%} -{% for editor in validation_editors.pinnedTrunk -%} - - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }} -{% endfor -%} + - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ pinnedTrunk }} {% endfor -%} {% endfor -%} {% endfor -%} diff --git a/.yamato/project.metafile b/.yamato/project.metafile index a3ceb884fc..0cc9ff7d20 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -184,8 +184,7 @@ validation_editors: - 77e2e2eea1be7153f85edac158fd663828839731 minimal: - 6000.0 - pinnedTrunk: - - 77e2e2eea1be7153f85edac158fd663828839731 +pinnedTrunk: 77e2e2eea1be7153f85edac158fd663828839731 # Scripting backends used by Standalone RunTimeTests--------------------------------------------------- From 9cc22f1bce8cf9f9a88ff95924734349c2f0cbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Chrobot?= Date: Fri, 8 May 2026 13:18:28 +0200 Subject: [PATCH 3/5] typo --- .yamato/_triggers.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 668ad65ae5..8cdf8445ce 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -76,19 +76,19 @@ pr_code_changes_checks: - .yamato/vetting-test.yml#vetting_test # Run package EditMode and Playmode package tests on trunk and an older supported editor (6000.0) - - .yamato/package-tests.yml#package_test_-_ngo_pinnedTrunk_mac + - .yamato/package-tests.yml#package_test_-_ngo_{{ pinnedTrunk }}_mac - .yamato/package-tests.yml#package_test_-_ngo_6000.0_win # Run testproject EditMode and Playmode project tests on trunk and an older supported editor (6000.0) - - .yamato/project-tests.yml#test_testproject_win_pinnedTrunk + - .yamato/project-tests.yml#test_testproject_win_{{ pinnedTrunk }} - .yamato/project-tests.yml#test_testproject_mac_6000.0 # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs # desktop_standalone_test and cmb_service_standalone_test are both reusing desktop_standalone_build dependency so we run those in the same configuration on PRs to reduce waiting time. # Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_pinnedTrunk - - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_pinnedTrunk + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_{{ pinnedTrunk }} + - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_{{ pinnedTrunk }} triggers: expression: |- (pull_request.comment eq "ngo" OR From bf520fb7fa212920a76ad5ede8c883c12af1c0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Chrobot?= <124174716+michalChrobot@users.noreply.github.com> Date: Fri, 8 May 2026 14:48:00 +0200 Subject: [PATCH 4/5] Update .yamato/project.metafile --- .yamato/project.metafile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 0cc9ff7d20..117c8ea91b 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -181,7 +181,7 @@ validation_editors: - 6000.4 - 6000.5 - trunk - - 77e2e2eea1be7153f85edac158fd663828839731 + - a4ce83e807ca9aff8394d1cc07341168dc49df03 minimal: - 6000.0 pinnedTrunk: 77e2e2eea1be7153f85edac158fd663828839731 From fb37409b008ea4279b4197707c02dd0e7b588ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Chrobot?= <124174716+michalChrobot@users.noreply.github.com> Date: Fri, 8 May 2026 14:48:06 +0200 Subject: [PATCH 5/5] Update .yamato/project.metafile --- .yamato/project.metafile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 117c8ea91b..871ff18710 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -184,7 +184,7 @@ validation_editors: - a4ce83e807ca9aff8394d1cc07341168dc49df03 minimal: - 6000.0 -pinnedTrunk: 77e2e2eea1be7153f85edac158fd663828839731 +pinnedTrunk: a4ce83e807ca9aff8394d1cc07341168dc49df03 # Scripting backends used by Standalone RunTimeTests---------------------------------------------------