Skip to content

Commit 1de6174

Browse files
chore: [UpPort] Reduce the number of jobs running on PR triggers (#3545)
Reduce the number of jobs that are running on each PR from 43 jobs to 26. ## Changelog - Changed: Updated the automated test configuration. ## Testing and Documentation ## Backport This is an up-port of #3543 --------- Co-authored-by: michalChrobot <michal.chrobot@unity3d.com>
1 parent 5da3ff4 commit 1de6174

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

.yamato/_triggers.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,20 @@
4545
# Since standards job is a part of initial checks it's not present as direct dependency here!!!!!!!!!!!!!!!!!!!!
4646
pull_request_trigger:
4747
name: Pull Request Trigger (develop, develop-2.0.0, & release branches)
48+
# Run the following tests on a selection of different desktop platforms
4849
dependencies:
49-
# Run package EditMode and Playmode package tests on trunk
50-
- .yamato/_run-all.yml#run_all_package_tests_trunk
51-
# Run package EditMode and Playmode package tests on minimum supported editor (6000.0 in case of NGOv2.X)
52-
- .yamato/_run-all.yml#run_all_package_tests_6000
53-
# Run project EditMode and Playmode project tests on trunk
54-
- .yamato/_run-all.yml#run_all_project_tests_trunk
55-
# Run project EditMode and Playmode project tests on minimum supported editor (6000.0 in case of NGOv2.X)
56-
- .yamato/_run-all.yml#run_all_project_tests_6000
57-
# Run standalone test. Run windows standalone tests as this is our most common platform, and run ubuntu rust tests.
50+
# Run package EditMode and Playmode package tests on trunk and an older supported editor (6000.0)
51+
- .yamato/package-tests.yml#package_test_-_ngo_trunk_mac
52+
- .yamato/package-tests.yml#package_test_-_ngo_6000.0_win
53+
54+
# Run testproject EditMode and Playmode project tests on trunk and an older supported editor (6000.0)
55+
- .yamato/project-tests.yml#test_testproject_win_trunk
56+
- .yamato/project-tests.yml#test_testproject_mac_6000.0
57+
58+
# 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
5859
# Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
5960
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_6000.0
60-
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.0
61+
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
6162
triggers:
6263
cancel_old_ci: true
6364
pull_requests:

.yamato/project.metafile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# 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).
2020
# It uses ubuntu since Linux VMs are faster and cheaper to provision than Mac or Windows Virtual Machines (VMs).
2121
# The b1.small flavour is nearly always sufficient for jobs that don’t involve running Unity Editor.
22-
small_agent_platform:
22+
small_agent_platform:
2323
- name: ubuntu
2424
type: Unity::VM
2525
image: package-ci/ubuntu-22.04:v4
@@ -40,7 +40,7 @@ test_platforms:
4040
image: package-ci/ubuntu-22.04:v4
4141
flavor: b1.large
4242
standalone: StandaloneLinux64
43-
desktop:
43+
desktop:
4444
- name: ubuntu
4545
type: Unity::VM
4646
image: package-ci/ubuntu-22.04:v4
@@ -146,7 +146,7 @@ test_platforms:
146146
image: package-ci/win10-xbox:v4
147147
flavor: b1.large
148148
standalone: GameCoreScarlett
149-
149+
150150
# EDITOR CONFIGURATIONS-------------------------------------------------------------------------------
151151
# Editors to be used for testing. NGOv2.X official support started from 6000.0 editor
152152
# TODO: When a new editor will be released it should be added to this list
@@ -156,13 +156,14 @@ validation_editors:
156156
- trunk
157157
all:
158158
- 6000.0
159-
- 6000.1
159+
- 6000.1
160+
- 6000.2
160161
- trunk
161-
162-
162+
163+
163164
# Scripting backends used by Standalone RunTimeTests---------------------------------------------------
164165

165-
scripting_backends:
166+
scripting_backends:
166167
- mono
167168
- il2cpp
168169

0 commit comments

Comments
 (0)