Skip to content

Commit 13da701

Browse files
ci: Added pinnedTrunk jobs and adjusted PR trigger (#3977)
* Added pnnedTrunk jobs and adjusted PR trigger * correction of metafile setup * typo * Update .yamato/project.metafile * Update .yamato/project.metafile
1 parent a38f8a4 commit 13da701

3 files changed

Lines changed: 81 additions & 16 deletions

File tree

.yamato/_run-all.yml

Lines changed: 75 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +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 -%}
41-
- .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }}
40+
- .yamato/package-tests.yml#package_test_-_ngo_trunk_{{ platform.name }}
4241
{% 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+
- .yamato/package-tests.yml#package_test_-_ngo_{{ pinnedTrunk }}_{{ platform.name }}
4349
{% endfor -%}
4450

4551
# Runs all package tests on mimimum supported editor (6000.0 in case of NGOv2.X)
@@ -73,9 +79,19 @@ run_all_project_tests_trunk:
7379
{% for project in projects.all -%}
7480
{% if project.has_tests == "true" -%}
7581
{% for platform in test_platforms.desktop -%}
76-
{% for editor in validation_editors.default -%}
77-
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }}
82+
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_trunk
7883
{% endfor -%}
84+
{% endif -%}
85+
{% endfor -%}
86+
87+
# Runs all projects tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
88+
run_all_project_tests_pinnedTrunk:
89+
name: Run All Project Tests [Pinned Trunk only]
90+
dependencies:
91+
{% for project in projects.all -%}
92+
{% if project.has_tests == "true" -%}
93+
{% for platform in test_platforms.desktop -%}
94+
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }}
7995
{% endfor -%}
8096
{% endif -%}
8197
{% endfor -%}
@@ -125,10 +141,19 @@ run_all_webgl_builds_trunk:
125141
dependencies:
126142
{% for project in projects.default -%}
127143
{% for platform in test_platforms.desktop -%}
128-
{% for editor in validation_editors.default -%}
129-
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
144+
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_trunk
130145
{% endfor -%}
131146
{% endfor -%}
147+
148+
149+
# Runs all WebGL builds on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
150+
run_all_webgl_builds_pinnedTrunk:
151+
name: Run All WebGl Build [Pinned Trunk only]
152+
dependencies:
153+
{% for project in projects.default -%}
154+
{% for platform in test_platforms.desktop -%}
155+
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }}
156+
{% endfor -%}
132157
{% endfor -%}
133158

134159
# Runs all WebGL builds on 6000.0 editor
@@ -163,12 +188,22 @@ run_all_project_tests_desktop_standalone_trunk:
163188
dependencies:
164189
{% for project in projects.default -%}
165190
{% for platform in test_platforms.desktop -%}
166-
{% for editor in validation_editors.default -%}
167191
{% for backend in scripting_backends -%}
168-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
192+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_trunk
169193
{% endfor -%}
170194
{% endfor -%}
171195
{% endfor -%}
196+
197+
# Runs all Desktop tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
198+
run_all_project_tests_desktop_standalone_pinnedTrunk:
199+
name: Run All Standalone Tests - Desktop [Pinned Trunk only]
200+
dependencies:
201+
{% for project in projects.default -%}
202+
{% for platform in test_platforms.desktop -%}
203+
{% for backend in scripting_backends -%}
204+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ pinnedTrunk }}
205+
{% endfor -%}
206+
{% endfor -%}
172207
{% endfor -%}
173208

174209
# Runs all Desktop tests on mimimum supported editor (6000.0 in case of NGOv2.X)
@@ -202,10 +237,18 @@ run_all_project_tests_mobile_standalone_trunk:
202237
dependencies:
203238
{% for project in projects.default -%}
204239
{% for platform in test_platforms.mobile_test -%}
205-
{% for editor in validation_editors.default -%}
206-
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
240+
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_trunk
207241
{% endfor -%}
208242
{% endfor -%}
243+
244+
# Runs all Mobile tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
245+
run_all_project_tests_mobile_standalone_pinnedTrunk:
246+
name: Run All Standalone Tests - Mobile [Pinned Trunk only]
247+
dependencies:
248+
{% for project in projects.default -%}
249+
{% for platform in test_platforms.mobile_test -%}
250+
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }}
251+
{% endfor -%}
209252
{% endfor -%}
210253

211254
# Runs all Mobile tests on mimimum supported editor (6000.0 in case of NGOv2.X)
@@ -238,10 +281,18 @@ run_all_project_tests_console_standalone_trunk:
238281
dependencies:
239282
{% for project in projects.default -%}
240283
{% for platform in test_platforms.console_test -%}
241-
{% for editor in validation_editors.default -%}
242-
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
284+
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_trunk
243285
{% endfor -%}
244286
{% endfor -%}
287+
288+
# Runs all Console tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
289+
run_all_project_tests_console_standalone_pinnedTrunk:
290+
name: Run All Standalone Tests - Console [Pinned Trunk only]
291+
dependencies:
292+
{% for project in projects.default -%}
293+
{% for platform in test_platforms.console_test -%}
294+
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }}
295+
{% endfor -%}
245296
{% endfor -%}
246297

247298
# Runs all Console tests on mimimum supported editor (6000.0 in case of NGOv2.X)
@@ -281,6 +332,18 @@ run_all_project_tests_cmb_service_trunk:
281332
{% endfor -%}
282333
{% endfor -%}
283334

335+
# Runs all CMB service tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
336+
run_all_project_tests_cmb_service_pinnedTrunk:
337+
name: Run All CMB Service Tests [Pinned Trunk only]
338+
dependencies:
339+
{% for project in projects.default -%}
340+
{% for platform in test_platforms.default -%}
341+
{% for backend in scripting_backends -%}
342+
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ pinnedTrunk }}
343+
{% endfor -%}
344+
{% endfor -%}
345+
{% endfor -%}
346+
284347
# Runs all CMB service tests on mimimum supported editor (6000.0 in case of NGOv2.X)
285348
run_all_project_tests_cmb_service_6000:
286349
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,10 @@ validation_editors:
181181
- 6000.4
182182
- 6000.5
183183
- trunk
184+
- a4ce83e807ca9aff8394d1cc07341168dc49df03
184185
minimal:
185186
- 6000.0
187+
pinnedTrunk: a4ce83e807ca9aff8394d1cc07341168dc49df03
186188

187189

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

0 commit comments

Comments
 (0)