Skip to content

Commit 3ee8a9b

Browse files
committed
Added pnnedTrunk jobs and adjusted PR trigger
1 parent a38f8a4 commit 3ee8a9b

3 files changed

Lines changed: 90 additions & 10 deletions

File tree

.yamato/_run-all.yml

Lines changed: 83 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,15 @@ run_all_package_tests_trunk:
3737
name: Run All Package Tests [Trunk only]
3838
dependencies:
3939
{% for platform in test_platforms.desktop -%}
40-
{% for editor in validation_editors.default -%}
40+
- .yamato/package-tests.yml#package_test_-_ngo_trunk_{{ platform.name }}
41+
{% endfor -%}
42+
43+
# Runs all package tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
44+
run_all_package_tests_pinnedTrunk:
45+
name: Run All Package Tests [Pinned Trunk only]
46+
dependencies:
47+
{% for platform in test_platforms.desktop -%}
48+
{% for editor in validation_editors.pinnedTrunk -%}
4149
- .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }}
4250
{% endfor -%}
4351
{% endfor -%}
@@ -73,7 +81,19 @@ run_all_project_tests_trunk:
7381
{% for project in projects.all -%}
7482
{% if project.has_tests == "true" -%}
7583
{% for platform in test_platforms.desktop -%}
76-
{% for editor in validation_editors.default -%}
84+
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_trunk
85+
{% endfor -%}
86+
{% endif -%}
87+
{% endfor -%}
88+
89+
# Runs all projects tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
90+
run_all_project_tests_pinnedTrunk:
91+
name: Run All Project Tests [Pinned Trunk only]
92+
dependencies:
93+
{% for project in projects.all -%}
94+
{% if project.has_tests == "true" -%}
95+
{% for platform in test_platforms.desktop -%}
96+
{% for editor in validation_editors.pinnedTrunk -%}
7797
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }}
7898
{% endfor -%}
7999
{% endfor -%}
@@ -125,7 +145,18 @@ run_all_webgl_builds_trunk:
125145
dependencies:
126146
{% for project in projects.default -%}
127147
{% for platform in test_platforms.desktop -%}
128-
{% for editor in validation_editors.default -%}
148+
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_trunk
149+
{% endfor -%}
150+
{% endfor -%}
151+
152+
153+
# Runs all WebGL builds on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
154+
run_all_webgl_builds_pinnedTrunk:
155+
name: Run All WebGl Build [Pinned Trunk only]
156+
dependencies:
157+
{% for project in projects.default -%}
158+
{% for platform in test_platforms.desktop -%}
159+
{% for editor in validation_editors.pinnedTrunk -%}
129160
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
130161
{% endfor -%}
131162
{% endfor -%}
@@ -163,8 +194,20 @@ run_all_project_tests_desktop_standalone_trunk:
163194
dependencies:
164195
{% for project in projects.default -%}
165196
{% for platform in test_platforms.desktop -%}
166-
{% for editor in validation_editors.default -%}
167197
{% for backend in scripting_backends -%}
198+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_trunk
199+
{% endfor -%}
200+
{% endfor -%}
201+
{% endfor -%}
202+
203+
# Runs all Desktop tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
204+
run_all_project_tests_desktop_standalone_pinnedTrunk:
205+
name: Run All Standalone Tests - Desktop [Pinned Trunk only]
206+
dependencies:
207+
{% for project in projects.default -%}
208+
{% for platform in test_platforms.desktop -%}
209+
{% for backend in scripting_backends -%}
210+
{% for editor in validation_editors.pinnedTrunk -%}
168211
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
169212
{% endfor -%}
170213
{% endfor -%}
@@ -202,7 +245,17 @@ run_all_project_tests_mobile_standalone_trunk:
202245
dependencies:
203246
{% for project in projects.default -%}
204247
{% for platform in test_platforms.mobile_test -%}
205-
{% for editor in validation_editors.default -%}
248+
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_trunk
249+
{% endfor -%}
250+
{% endfor -%}
251+
252+
# Runs all Mobile tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
253+
run_all_project_tests_mobile_standalone_pinnedTrunk:
254+
name: Run All Standalone Tests - Mobile [Pinned Trunk only]
255+
dependencies:
256+
{% for project in projects.default -%}
257+
{% for platform in test_platforms.mobile_test -%}
258+
{% for editor in validation_editors.pinnedTrunk -%}
206259
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
207260
{% endfor -%}
208261
{% endfor -%}
@@ -238,7 +291,17 @@ run_all_project_tests_console_standalone_trunk:
238291
dependencies:
239292
{% for project in projects.default -%}
240293
{% for platform in test_platforms.console_test -%}
241-
{% for editor in validation_editors.default -%}
294+
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_trunk
295+
{% endfor -%}
296+
{% endfor -%}
297+
298+
# Runs all Console tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
299+
run_all_project_tests_console_standalone_pinnedTrunk:
300+
name: Run All Standalone Tests - Console [Pinned Trunk only]
301+
dependencies:
302+
{% for project in projects.default -%}
303+
{% for platform in test_platforms.console_test -%}
304+
{% for editor in validation_editors.pinnedTrunk -%}
242305
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
243306
{% endfor -%}
244307
{% endfor -%}
@@ -281,6 +344,20 @@ run_all_project_tests_cmb_service_trunk:
281344
{% endfor -%}
282345
{% endfor -%}
283346

347+
# Runs all CMB service tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
348+
run_all_project_tests_cmb_service_pinnedTrunk:
349+
name: Run All CMB Service Tests [Pinned Trunk only]
350+
dependencies:
351+
{% for project in projects.default -%}
352+
{% for platform in test_platforms.default -%}
353+
{% for backend in scripting_backends -%}
354+
{% for editor in validation_editors.pinnedTrunk -%}
355+
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
356+
{% endfor -%}
357+
{% endfor -%}
358+
{% endfor -%}
359+
{% endfor -%}
360+
284361
# Runs all CMB service tests on mimimum supported editor (6000.0 in case of NGOv2.X)
285362
run_all_project_tests_cmb_service_6000:
286363
name: Run All CMB Service Tests [6000.0]

.yamato/_triggers.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,19 @@ pr_code_changes_checks:
7676
- .yamato/vetting-test.yml#vetting_test
7777

7878
# Run package EditMode and Playmode package tests on trunk and an older supported editor (6000.0)
79-
- .yamato/package-tests.yml#package_test_-_ngo_trunk_mac
79+
- .yamato/package-tests.yml#package_test_-_ngo_pinnedTrunk_mac
8080
- .yamato/package-tests.yml#package_test_-_ngo_6000.0_win
8181

8282
# Run testproject EditMode and Playmode project tests on trunk and an older supported editor (6000.0)
83-
- .yamato/project-tests.yml#test_testproject_win_trunk
83+
- .yamato/project-tests.yml#test_testproject_win_pinnedTrunk
8484
- .yamato/project-tests.yml#test_testproject_mac_6000.0
8585

8686
# 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
8787
# Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
8888
# 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.
8989
# Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations
90-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk
91-
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
90+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_pinnedTrunk
91+
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_pinnedTrunk
9292
triggers:
9393
expression: |-
9494
(pull_request.comment eq "ngo" OR

.yamato/project.metafile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,11 @@ validation_editors:
181181
- 6000.4
182182
- 6000.5
183183
- trunk
184+
- 77e2e2eea1be7153f85edac158fd663828839731
184185
minimal:
185186
- 6000.0
187+
pinnedTrunk:
188+
- 77e2e2eea1be7153f85edac158fd663828839731
186189

187190

188191
# Scripting backends used by Standalone RunTimeTests---------------------------------------------------

0 commit comments

Comments
 (0)