Skip to content

Commit 2e3ff16

Browse files
michalChrobotmichalChrobot
committed
Updated dfault and minimal editor handling
1 parent cef6e6a commit 2e3ff16

File tree

5 files changed

+83
-83
lines changed

5 files changed

+83
-83
lines changed

‎.yamato/_run-all.yml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ run_all_package_tests:
3030
{% endfor -%}
3131

3232

33-
# Runs all package tests on 6000.2 editor (latest supported editor)
34-
run_all_package_tests_6000.2:
35-
name: Run All Package Tests [6000.2 only]
33+
# Runs all package tests on default editor (latest supported editor)
34+
run_all_package_tests_{{ validation_editors.default }}:
35+
name: Run All Package Tests [{{ validation_editors.default }} only]
3636
dependencies:
3737
{% for platform in test_platforms.desktop -%}
3838
{% for editor in validation_editors.default -%}
3939
- .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }}
4040
{% endfor -%}
4141
{% endfor -%}
4242

43-
# Runs all package tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor)
44-
run_all_package_tests_2022:
45-
name: Run All Package Tests [2022.3]
43+
# Runs all package tests on minimal supported editor
44+
run_all_package_tests_{{ validation_editors.minimal }}:
45+
name: Run All Package Tests [{{ validation_editors.minimal }}]
4646
dependencies:
4747
{% for platform in test_platforms.desktop -%}
48-
- .yamato/package-tests.yml#package_test_-_ngo_2022.3_{{ platform.name }}
48+
- .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.minimal }}_{{ platform.name }}
4949
{% endfor -%}
5050

5151

@@ -64,9 +64,9 @@ run_all_project_tests:
6464
{% endfor -%}
6565

6666

67-
# Runs all projects tests on 6000.2 editor (latest supported editor)
68-
run_all_project_tests_6000.2:
69-
name: Run All Project Tests [6000.2 only]
67+
# Runs all projects tests on default editor (latest supported editor)
68+
run_all_project_tests_{{ validation_editors.default }}:
69+
name: Run All Project Tests [{{ validation_editors.default }} only]
7070
dependencies:
7171
{% for project in projects.all -%}
7272
{% if project.has_tests == "true" -%}
@@ -78,14 +78,14 @@ run_all_project_tests_6000.2:
7878
{% endif -%}
7979
{% endfor -%}
8080

81-
# Runs all projects tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor)
82-
run_all_project_tests_2022:
83-
name: Run All Project Tests [2022.3]
81+
# Runs all projects tests on minimal supported editor
82+
run_all_project_tests_{{ validation_editors.minimal }}:
83+
name: Run All Project Tests [{{ validation_editors.minimal }}]
8484
dependencies:
8585
{% for project in projects.all -%}
8686
{% if project.has_tests == "true" -%}
8787
{% for platform in test_platforms.desktop -%}
88-
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_2022.3
88+
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }}
8989
{% endfor -%}
9090
{% endif -%}
9191
{% endfor -%}
@@ -117,9 +117,9 @@ run_all_webgl_builds:
117117
{% endfor -%}
118118

119119

120-
# Runs all WebGL builds on 6000.2 editor (latest supported editor)
121-
run_all_webgl_builds_6000.2:
122-
name: Run All WebGl Build [6000.2 only]
120+
# Runs all WebGL builds on default editor (latest supported editor)
121+
run_all_webgl_builds_{{ validation_editors.default }}:
122+
name: Run All WebGl Build [{{ validation_editors.default }} only]
123123
dependencies:
124124
{% for project in projects.default -%}
125125
{% for platform in test_platforms.desktop -%}
@@ -129,13 +129,13 @@ run_all_webgl_builds_6000.2:
129129
{% endfor -%}
130130
{% endfor -%}
131131

132-
# Runs all WebGL builds on 2022.3 editor (2022.3 will soon be a minimum supported editor)
133-
run_all_webgl_builds_2022:
134-
name: Run All WebGl Build [2022.3]
132+
# Runs all WebGL builds on minimal supported editor
133+
run_all_webgl_builds_{{ validation_editors.minimal }}:
134+
name: Run All WebGl Build [{{ validation_editors.minimal }}]
135135
dependencies:
136136
{% for project in projects.default -%}
137137
{% for platform in test_platforms.desktop -%}
138-
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_2022.3
138+
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }}
139139
{% endfor -%}
140140
{% endfor -%}
141141

@@ -155,9 +155,9 @@ run_all_project_tests_desktop_standalone:
155155
{% endfor -%}
156156

157157

158-
# Runs all Desktop tests on 6000.2 editor (latest supported editor)
159-
run_all_project_tests_desktop_standalone_6000.2:
160-
name: Run All Standalone Tests - Desktop [6000.2 only]
158+
# Runs all Desktop tests on default editor (latest supported editor)
159+
run_all_project_tests_desktop_standalone_{{ validation_editors.default }}:
160+
name: Run All Standalone Tests - Desktop [{{ validation_editors.default }} only]
161161
dependencies:
162162
{% for project in projects.default -%}
163163
{% for platform in test_platforms.desktop -%}
@@ -169,14 +169,14 @@ run_all_project_tests_desktop_standalone_6000.2:
169169
{% endfor -%}
170170
{% endfor -%}
171171

172-
# Runs all Desktop tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor)
173-
run_all_project_tests_desktop_standalone_2022:
174-
name: Run All Standalone Tests - Desktop [2022.3]
172+
# Runs all Desktop tests on minimal supported editor
173+
run_all_project_tests_desktop_standalone_{{ validation_editors.minimal }}:
174+
name: Run All Standalone Tests - Desktop [{{ validation_editors.minimal }}]
175175
dependencies:
176176
{% for project in projects.default -%}
177177
{% for platform in test_platforms.desktop -%}
178178
{% for backend in scripting_backends -%}
179-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_2022.3
179+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editors.minimal }}
180180
{% endfor -%}
181181
{% endfor -%}
182182
{% endfor -%}
@@ -194,9 +194,9 @@ run_all_project_tests_mobile_standalone:
194194
{% endfor -%}
195195

196196

197-
# Runs all Mobile tests on 6000.2 editor (latest supported editor)
198-
run_all_project_tests_mobile_standalone_6000.2:
199-
name: Run All Standalone Tests - Mobile [6000.2 only]
197+
# Runs all Mobile tests on default editor (latest supported editor)
198+
run_all_project_tests_mobile_standalone_{{ validation_editors.default }}:
199+
name: Run All Standalone Tests - Mobile [{{ validation_editors.default }} only]
200200
dependencies:
201201
{% for project in projects.default -%}
202202
{% for platform in test_platforms.mobile_test -%}
@@ -206,13 +206,13 @@ run_all_project_tests_mobile_standalone_6000.2:
206206
{% endfor -%}
207207
{% endfor -%}
208208

209-
# Runs all Mobile tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor)
210-
run_all_project_tests_mobile_standalone_2022:
211-
name: Run All Standalone Tests - Mobile [2022.3]
209+
# Runs all Mobile tests on minimal supported editor
210+
run_all_project_tests_mobile_standalone_{{ validation_editors.minimal }}:
211+
name: Run All Standalone Tests - Mobile [{{ validation_editors.minimal }}]
212212
dependencies:
213213
{% for project in projects.default -%}
214214
{% for platform in test_platforms.mobile_test -%}
215-
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_2022.3
215+
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }}
216216
{% endfor -%}
217217
{% endfor -%}
218218

@@ -230,9 +230,9 @@ run_all_project_tests_console_standalone:
230230
{% endfor -%}
231231

232232

233-
# Runs all Console tests on 6000.2 editor (latest supported editor)
234-
run_all_project_tests_console_standalone_6000.2:
235-
name: Run All Standalone Tests - Console [6000.2 only]
233+
# Runs all Console tests on default editor (latest supported editor)
234+
run_all_project_tests_console_standalone_{{ validation_editors.default }}:
235+
name: Run All Standalone Tests - Console [{{ validation_editors.default }} only]
236236
dependencies:
237237
{% for project in projects.default -%}
238238
{% for platform in test_platforms.console_test -%}
@@ -242,12 +242,12 @@ run_all_project_tests_console_standalone_6000.2:
242242
{% endfor -%}
243243
{% endfor -%}
244244

245-
# Runs all Console tests on mimimum supported editor (2022.3 in case of NGOv1.X) (2022.3 will soon be a minimum supported editor)
246-
run_all_project_tests_console_standalone_2022:
247-
name: Run All Standalone Tests - Console [2022.3]
245+
# Runs all Console tests on minimal supported editor
246+
run_all_project_tests_console_standalone_{{ validation_editors.minimal }}:
247+
name: Run All Standalone Tests - Console [{{ validation_editors.minimal }}]
248248
dependencies:
249249
{% for project in projects.default -%}
250250
{% for platform in test_platforms.console_test -%}
251-
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_2022.3
251+
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.minimal }}
252252
{% endfor -%}
253253
{% endfor -%}

‎.yamato/_triggers.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Nightly:
2525
# This test validates same subset as pull_request_trigger with addition of mobile/console tests and webgl builds
2626
# Runs daily on develop (local configuration)
27-
# Includes all test types but only on 6000.2 (latest supported editor).
27+
# Includes all test types but only on {{ validation_editors.default }} (latest supported editor).
2828
# Adds platform-specific and APV validation
2929

3030
# Weekly:
@@ -72,21 +72,21 @@ pr_code_changes_checks:
7272
# Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
7373
- .yamato/vetting-test.yml#vetting_test
7474

75-
# Run package EditMode and Playmode package tests on 6000.2 (latest supported editor) and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor)
76-
- .yamato/package-tests.yml#package_test_-_ngo_6000.2_mac
77-
- .yamato/package-tests.yml#package_test_-_ngo_2022.3_win
75+
# Run package EditMode and Playmode package tests on {{ validation_editors.default }} (latest supported editor) and an {{ validation_editors.minimal }} supported editor
76+
- .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.default }}_mac
77+
- .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.minimal }}_win
7878

79-
# Run testproject EditMode and Playmode project tests on 6000.2 (latest supported editor) and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor)
80-
- .yamato/project-tests.yml#test_testproject_win_6000.2
81-
- .yamato/project-tests.yml#test_testproject_mac_2022.3
79+
# Run testproject EditMode and Playmode project tests on {{ validation_editors.default }} (latest supported editor) and an {{ validation_editors.minimal }} supported editor
80+
- .yamato/project-tests.yml#test_testproject_win_{{ validation_editors.default }}
81+
- .yamato/project-tests.yml#test_testproject_mac_{{ validation_editors.minimal }}
8282

83-
# Run tools integration tests EditMode and Playmode tests on 6000.2 (latest supported editor) and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor)
84-
- .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_2022.3
85-
- .yamato/project-tests.yml#test_testproject-tools-integration_win_6000.2
83+
# Run tools integration tests EditMode and Playmode tests on {{ validation_editors.default }} (latest supported editor) and an {{ validation_editors.minimal }} supported editor
84+
- .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_{{ validation_editors.minimal }}
85+
- .yamato/project-tests.yml#test_testproject-tools-integration_win_{{ validation_editors.default }}
8686

8787
# 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
8888
# Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
89-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2022.3
89+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_{{ validation_editors.minimal }}
9090
triggers:
9191
expression: |-
9292
(pull_request.comment eq "ngo" OR
@@ -114,11 +114,11 @@ pr_code_changes_checks:
114114

115115

116116

117-
# Run all tests on 6000.2 (latest supported editor) on nightly basis.
117+
# Run all tests on {{ validation_editors.default }} (latest supported editor) on nightly basis.
118118
# Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds
119-
# Those tests are all running on 6000.2 (latest supported editor) since it's daily and running all of them would add a lot of overhead
119+
# Those tests are all running on {{ validation_editors.default }} (latest supported editor) since it's daily and running all of them would add a lot of overhead
120120
develop_nightly:
121-
name: "\U0001F319 [Nightly] Run All Tests [6000.2 and 2022]"
121+
name: "\U0001F319 [Nightly] Run All Tests [{{ validation_editors.default }} and {{ validation_editors.minimal }}]"
122122
triggers:
123123
recurring:
124124
- branch: develop
@@ -129,38 +129,38 @@ develop_nightly:
129129
- .yamato/vetting-test.yml#vetting_test
130130
# Run project standards to verify package/default project
131131
- .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.default }}
132-
- .yamato/project-standards.yml#standards_ubuntu_testproject_2022.3
132+
- .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.minimal }}
133133
# Run APV jobs to make sure the change won't break any dependants
134134
- .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
135-
# Run package EditMode and Playmode tests on desktop platforms on 6000.2 (latest supported editor) and 2022.3 (2022.3 will soon be a minimum supported editor)
136-
- .yamato/_run-all.yml#run_all_package_tests_6000.2
137-
- .yamato/_run-all.yml#run_all_package_tests_2022
138-
# Run project EditMode and PLaymode tests on desktop platforms on 6000.2 (latest supported editor) and 2022.3 (2022.3 will soon be a minimum supported editor)
139-
- .yamato/_run-all.yml#run_all_project_tests_6000.2
140-
- .yamato/_run-all.yml#run_all_project_tests_2022
141-
# Run Runtime tests on desktop players on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor)
142-
- .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_6000.2
143-
- .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_2022
144-
# Run Runtime tests on mobile players on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor)
145-
- .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_6000.2
146-
- .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_2022
147-
# Run Runtime tests on console players on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor)
148-
- .yamato/_run-all.yml#run_all_project_tests_console_standalone_6000.2
149-
- .yamato/_run-all.yml#run_all_project_tests_console_standalone_2022
150-
# Build player for webgl platform on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor)
151-
- .yamato/_run-all.yml#run_all_webgl_builds_6000.2
152-
- .yamato/_run-all.yml#run_all_webgl_builds_2022
153-
# Build player for webgl platform on 6000.2 (latest supported editor) and 2022.3 editors (2022.3 will soon be a minimum supported editor)
154-
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_6000.2
155-
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_2022.3
135+
# Run package EditMode and Playmode tests on desktop platforms on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
136+
- .yamato/_run-all.yml#run_all_package_tests_{{ validation_editors.default }}
137+
- .yamato/_run-all.yml#run_all_package_tests_{{ validation_editors.minimal }}
138+
# Run project EditMode and PLaymode tests on desktop platforms on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
139+
- .yamato/_run-all.yml#run_all_project_tests_{{ validation_editors.default }}
140+
- .yamato/_run-all.yml#run_all_project_tests_{{ validation_editors.minimal }}
141+
# Run Runtime tests on desktop players on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
142+
- .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_{{ validation_editors.default }}
143+
- .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_{{ validation_editors.minimal }}
144+
# Run Runtime tests on mobile players on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
145+
- .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_{{ validation_editors.default }}
146+
- .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_{{ validation_editors.minimal }}
147+
# Run Runtime tests on console players on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
148+
- .yamato/_run-all.yml#run_all_project_tests_console_standalone_{{ validation_editors.default }}
149+
- .yamato/_run-all.yml#run_all_project_tests_console_standalone_{{ validation_editors.minimal }}
150+
# Build player for webgl platform on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
151+
- .yamato/_run-all.yml#run_all_webgl_builds_{{ validation_editors.default }}
152+
- .yamato/_run-all.yml#run_all_webgl_builds_{{ validation_editors.minimal }}
153+
# Build player for webgl platform on {{ validation_editors.default }} (latest supported editor) and {{ validation_editors.minimal }}
154+
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_{{ validation_editors.default }}
155+
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_{{ validation_editors.minimal }}
156156
# Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
157157
- .yamato/vetting-test.yml#vetting_test
158158

159159

160160
# Run all tests on weekly bases
161161
# Same subset as develop_nightly but runs per all supported editors as well as executes code coverage test and runs project standards per project
162162
# It's not running wrench jobs since those will run either way in nightly test run
163-
# This in contrast to nightly checks will run tests on all editors (not only 6000.2). Running those on weekly basis and 6000.2 (latest supported editor) tests nightly should be a good balance between making sure that tests are passing and overhead of running lots of tests
163+
# This in contrast to nightly checks will run tests on all editors (not only {{ validation_editors.default }}). Running those on weekly basis and {{ validation_editors.default }} (latest supported editor) tests nightly should be a good balance between making sure that tests are passing and overhead of running lots of tests
164164
develop_weekly_trunk:
165165
name: "\U0001F319 [Weekly] Run All Tests"
166166
triggers:
@@ -183,7 +183,7 @@ develop_weekly_trunk:
183183
- .yamato/_run-all.yml#run_all_project_tests_mobile_standalone
184184
# Run Runtime tests on console players
185185
- .yamato/_run-all.yml#run_all_project_tests_console_standalone
186-
# Build player for webgl platform on 6000.2 (latest supported editor)
186+
# Build player for webgl platform on {{ validation_editors.default }} (latest supported editor)
187187
- .yamato/_run-all.yml#run_all_webgl_builds
188188
# Run code coverage test
189189
- .yamato/code-coverage.yml#code_coverage_ubuntu_{{ validation_editors.default }}

0 commit comments

Comments
 (0)