From 0a5eaba7bb6deafd0e8881695e37a2175126d8e3 Mon Sep 17 00:00:00 2001 From: Emma Date: Fri, 11 Jul 2025 16:34:16 -0400 Subject: [PATCH 1/7] chore: [UpPort] Reduce the number of jobs running on PR triggers --- .yamato/_triggers.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 111833e3af..99d14f4696 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -45,18 +45,23 @@ # Since standards job is a part of initial checks it's not present as direct dependency here!!!!!!!!!!!!!!!!!!!! pull_request_trigger: name: Pull Request Trigger (develop, develop-2.0.0, & release branches) + # Run the following tests on a selection of different desktop platforms dependencies: - # Run package EditMode and Playmode package tests on trunk - - .yamato/_run-all.yml#run_all_package_tests_trunk - # Run package EditMode and Playmode package tests on minimum supported editor (6000.0 in case of NGOv2.X) - - .yamato/_run-all.yml#run_all_package_tests_6000 - # Run project EditMode and Playmode project tests on trunk - - .yamato/_run-all.yml#run_all_project_tests_trunk - # Run project EditMode and Playmode project tests on minimum supported editor (6000.0 in case of NGOv2.X) - - .yamato/_run-all.yml#run_all_project_tests_6000 - # Run standalone test. Run windows standalone tests as this is our most common platform, and run ubuntu rust tests. + # 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_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_mac_6000.0 + + # Run tools integration tests EditMode and Playmode tests on trunk and an older supported editor (6000.0) + - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_6000.0 + - .yamato/project-tests.yml#test_testproject-tools-integration_win_trunk + + # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_6000.0 + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2022.3 - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.0 triggers: cancel_old_ci: true From 877ba8c13d4d6889a4061cd25c84114ffbee1ff8 Mon Sep 17 00:00:00 2001 From: Emma Date: Fri, 11 Jul 2025 16:55:41 -0400 Subject: [PATCH 2/7] fix bad forward port --- .yamato/_triggers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 99d14f4696..7c0ad2416c 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -61,8 +61,8 @@ pull_request_trigger: # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2022.3 - - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.0 + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.0 + - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk triggers: cancel_old_ci: true pull_requests: From 16c3519ed4be33f4ee494a898438c70e3dc8a783 Mon Sep 17 00:00:00 2001 From: Emma Date: Fri, 11 Jul 2025 16:56:53 -0400 Subject: [PATCH 3/7] fix bad forward port v2 electric boogaloo --- .yamato/_triggers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 7c0ad2416c..dcbc527232 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -61,7 +61,7 @@ pull_request_trigger: # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.0 + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_6000.0.0 - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk triggers: cancel_old_ci: true From 41c662a32da19674e76d06bbd06d0debe72fc5f9 Mon Sep 17 00:00:00 2001 From: Emma Date: Fri, 11 Jul 2025 16:59:25 -0400 Subject: [PATCH 4/7] fix bad forward port: third times the charm --- .yamato/_triggers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index dcbc527232..5477d2a021 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -61,7 +61,7 @@ pull_request_trigger: # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_6000.0.0 + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_6000.0 - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk triggers: cancel_old_ci: true From 4c9ae096013267c1fa9c11babeab2fd71fdf4aba Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Mon, 14 Jul 2025 10:54:08 +0200 Subject: [PATCH 5/7] Used the occasion to update editor list --- .yamato/project.metafile | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index d5d9191a09..c0df0e815c 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -157,6 +157,7 @@ validation_editors: all: - 6000.0 - 6000.1 + - 6000.2 - trunk From a99ffa50061bdaedd510fdd0e3cb72c10cdb201d Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Mon, 14 Jul 2025 10:58:30 +0200 Subject: [PATCH 6/7] reintroduced testproject-tools-integration project --- .yamato/project.metafile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index c0df0e815c..6e77634b52 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -185,3 +185,6 @@ projects: - name: minimalproject path: minimalproject has_tests: false + - name: testproject-tools-integration + path: testproject-tools-integration + has_tests: true From cdf25e67b0b6db28ddfbb241ccec3e35247b3f85 Mon Sep 17 00:00:00 2001 From: Emma Date: Mon, 14 Jul 2025 14:12:14 -0400 Subject: [PATCH 7/7] remove references to testproject-tools-integration as the project has been moved to the tools repo and doesn't exist on the 2.x branch --- .yamato/_triggers.yml | 4 ---- .yamato/project.metafile | 17 +++++++---------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 5477d2a021..ec9da28a62 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -55,10 +55,6 @@ pull_request_trigger: - .yamato/project-tests.yml#test_testproject_win_trunk - .yamato/project-tests.yml#test_testproject_mac_6000.0 - # Run tools integration tests EditMode and Playmode tests on trunk and an older supported editor (6000.0) - - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_6000.0 - - .yamato/project-tests.yml#test_testproject-tools-integration_win_trunk - # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_6000.0 diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 6e77634b52..c347c412e8 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -19,7 +19,7 @@ # The small agent was created to handle jobs that don't involve running Unity and are in general super light when it comes to resource usage (for example pack job). # It uses ubuntu since Linux VMs are faster and cheaper to provision than Mac or Windows Virtual Machines (VMs). # The b1.small flavour is nearly always sufficient for jobs that don’t involve running Unity Editor. -small_agent_platform: +small_agent_platform: - name: ubuntu type: Unity::VM image: package-ci/ubuntu-22.04:v4 @@ -40,7 +40,7 @@ test_platforms: image: package-ci/ubuntu-22.04:v4 flavor: b1.large standalone: StandaloneLinux64 - desktop: + desktop: - name: ubuntu type: Unity::VM image: package-ci/ubuntu-22.04:v4 @@ -146,7 +146,7 @@ test_platforms: image: package-ci/win10-xbox:v4 flavor: b1.large standalone: GameCoreScarlett - + # EDITOR CONFIGURATIONS------------------------------------------------------------------------------- # Editors to be used for testing. NGOv2.X official support started from 6000.0 editor # TODO: When a new editor will be released it should be added to this list @@ -156,14 +156,14 @@ validation_editors: - trunk all: - 6000.0 - - 6000.1 + - 6000.1 - 6000.2 - trunk - - + + # Scripting backends used by Standalone RunTimeTests--------------------------------------------------- -scripting_backends: +scripting_backends: - mono - il2cpp @@ -185,6 +185,3 @@ projects: - name: minimalproject path: minimalproject has_tests: false - - name: testproject-tools-integration - path: testproject-tools-integration - has_tests: true