Skip to content

Commit 2cf209c

Browse files
michalChrobotmichalChrobot
authored
Merge branch 'develop-2.0.0' into disabled-tests-move-to-jira
2 parents 138ad6d + 84c06c7 commit 2cf209c

27 files changed

+157
-99
lines changed

‎.yamato/code-coverage.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ code_coverage_{{ platform.name }}_{{ editor }}:
1616
commands:
1717
- npm install -g upm-ci-utils@stable --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1818
- unity-downloader-cli -u {{ editor }} -c Editor --fast --wait
19-
- {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %} upm-ci package test -u {{ editor }} --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime' --extra-utr-arg="--extra-editor-arg=--burst-disable-compilation --extra-editor-arg=-testCategory --extra-editor-arg=!Performance --timeout=1800 --reruncount=1 --clean-library-on-rerun"
19+
- DISPLAY=:0 upm-ci package test -u {{ editor }} --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime' --extra-utr-arg="--extra-editor-arg=--burst-disable-compilation --extra-editor-arg=testCategory --extra-editor-arg=!Performance --timeout=1800 --reruncount=1 --clean-library-on-rerun"
2020
artifacts:
2121
logs:
2222
paths:
2323
- "upm-ci~/test-results/**/*"
24+
- "upm-ci~/test-results/CoverageResults/**/*"
2425
dependencies:
25-
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
26+
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}_upmCI
2627
{% endfor -%}
2728
{% endfor -%}

‎.yamato/package-pack.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,28 @@ package_pack_-_ngo_{{ platform.name }}:
2525
packages:
2626
paths:
2727
- "upm-ci~/**"
28+
{% endfor -%}
29+
30+
31+
# This is in essence the same job as the one above with the difference that upm-ci is used instead of upm-pvp
32+
# The reason for using it is that I had some problems with Code Coverage which in its current form uses upm-ci but if we would use the other pack job (the one above) we would need to use upm-pvp
33+
# I had some problems with getting it to work so as temporary solution I created this pack job which is used ONLY as a dependency of Code Coverage job (other jobs use the above definition of pack job)
34+
# TODO: remove this job and utilize the above one for Code Coverage job. This is tracked in MTT-11383
35+
{% for platform in test_platforms.default -%}
36+
{% for project in projects.default -%}
37+
package_pack_-_ngo_{{ platform.name }}_upmCI:
38+
name: Package Pack (legacy upm-ci) - NGO [{{ platform.name }}]
39+
agent:
40+
type: {{ platform.type }}
41+
image: {{ platform.image }}
42+
flavor: {{ platform.flavor }}
43+
timeout: 0.25
44+
commands:
45+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
46+
- upm-ci project pack --project-path {{ project.path }}
47+
artifacts:
48+
packages:
49+
paths:
50+
- "upm-ci~/packages/**/*"
51+
{% endfor -%}
2852
{% endfor -%}

‎.yamato/wrench/api-validation-jobs.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Auto-generated by Recipe Engine, do not modify manually.
22
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
3+
all_api_validation_jobs:
4+
name: All API Validation Jobs
5+
dependencies:
6+
- path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_windows
37

48
# upm-ci validation tests for API Validation - netcode.gameobjects - 6000.0 - windows (6000.0 - Windows).
59
api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
@@ -47,11 +51,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
4751
dependencies:
4852
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
4953
variables:
50-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
51-
triggers:
52-
expression: push.branch match "^release/.*"
53-
cancel_old_ci: true
54+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
5455
metadata:
5556
Job Maintainers: '#rm-packageworks'
56-
Wrench: 0.10.38.0
57+
Wrench: 0.10.40.0
5758

‎.yamato/wrench/package-pack-jobs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 0.10.38.0
27+
Wrench: 0.10.40.0
2828

‎.yamato/wrench/preview-a-p-v.yml‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ all_preview_apv_jobs:
1414
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos
1515
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu
1616
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows
17-
triggers:
18-
expression: push.branch match "^release/.*"
19-
cancel_old_ci: true
2017
metadata:
2118
Job Maintainers: '#rm-packageworks'
22-
Wrench: 0.10.38.0
19+
Wrench: 0.10.40.0
2320

2421
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
2522
preview_apv_-_6000_0_-_macos:
@@ -70,10 +67,10 @@ preview_apv_-_6000_0_-_macos:
7067
dependencies:
7168
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
7269
variables:
73-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
70+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
7471
metadata:
7572
Job Maintainers: '#rm-packageworks'
76-
Wrench: 0.10.38.0
73+
Wrench: 0.10.40.0
7774

7875
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
7976
preview_apv_-_6000_0_-_ubuntu:
@@ -124,10 +121,10 @@ preview_apv_-_6000_0_-_ubuntu:
124121
dependencies:
125122
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
126123
variables:
127-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
124+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
128125
metadata:
129126
Job Maintainers: '#rm-packageworks'
130-
Wrench: 0.10.38.0
127+
Wrench: 0.10.40.0
131128

132129
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
133130
preview_apv_-_6000_0_-_windows:
@@ -179,10 +176,10 @@ preview_apv_-_6000_0_-_windows:
179176
dependencies:
180177
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
181178
variables:
182-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
179+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
183180
metadata:
184181
Job Maintainers: '#rm-packageworks'
185-
Wrench: 0.10.38.0
182+
Wrench: 0.10.40.0
186183

187184
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
188185
preview_apv_-_6000_1_-_macos:
@@ -233,10 +230,10 @@ preview_apv_-_6000_1_-_macos:
233230
dependencies:
234231
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
235232
variables:
236-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
233+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
237234
metadata:
238235
Job Maintainers: '#rm-packageworks'
239-
Wrench: 0.10.38.0
236+
Wrench: 0.10.40.0
240237

241238
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
242239
preview_apv_-_6000_1_-_ubuntu:
@@ -287,10 +284,10 @@ preview_apv_-_6000_1_-_ubuntu:
287284
dependencies:
288285
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
289286
variables:
290-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
287+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
291288
metadata:
292289
Job Maintainers: '#rm-packageworks'
293-
Wrench: 0.10.38.0
290+
Wrench: 0.10.40.0
294291

295292
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
296293
preview_apv_-_6000_1_-_windows:
@@ -342,10 +339,10 @@ preview_apv_-_6000_1_-_windows:
342339
dependencies:
343340
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
344341
variables:
345-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
342+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
346343
metadata:
347344
Job Maintainers: '#rm-packageworks'
348-
Wrench: 0.10.38.0
345+
Wrench: 0.10.40.0
349346

350347
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
351348
preview_apv_-_6000_2_-_macos:
@@ -396,10 +393,10 @@ preview_apv_-_6000_2_-_macos:
396393
dependencies:
397394
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
398395
variables:
399-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
396+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
400397
metadata:
401398
Job Maintainers: '#rm-packageworks'
402-
Wrench: 0.10.38.0
399+
Wrench: 0.10.40.0
403400

404401
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
405402
preview_apv_-_6000_2_-_ubuntu:
@@ -450,10 +447,10 @@ preview_apv_-_6000_2_-_ubuntu:
450447
dependencies:
451448
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
452449
variables:
453-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
450+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
454451
metadata:
455452
Job Maintainers: '#rm-packageworks'
456-
Wrench: 0.10.38.0
453+
Wrench: 0.10.40.0
457454

458455
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
459456
preview_apv_-_6000_2_-_windows:
@@ -505,8 +502,8 @@ preview_apv_-_6000_2_-_windows:
505502
dependencies:
506503
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
507504
variables:
508-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
505+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
509506
metadata:
510507
Job Maintainers: '#rm-packageworks'
511-
Wrench: 0.10.38.0
508+
Wrench: 0.10.40.0
512509

‎.yamato/wrench/promotion-jobs.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,10 @@ publish_dry_run_netcode_gameobjects:
100100
unzip: true
101101
variables:
102102
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
103-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
104-
triggers:
105-
expression: push.branch match "^release/.*"
106-
cancel_old_ci: true
103+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
107104
metadata:
108105
Job Maintainers: '#rm-packageworks'
109-
Wrench: 0.10.38.0
106+
Wrench: 0.10.40.0
110107

111108
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
112109
publish_netcode_gameobjects:
@@ -207,8 +204,8 @@ publish_netcode_gameobjects:
207204
unzip: true
208205
variables:
209206
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
210-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
207+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
211208
metadata:
212209
Job Maintainers: '#rm-packageworks'
213-
Wrench: 0.10.38.0
210+
Wrench: 0.10.40.0
214211

‎.yamato/wrench/publish-trigger.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Auto-generated by Recipe Engine, do not modify manually.
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
3+
all_promotion_related_jobs_promotiontrigger:
4+
name: All Promotion Related Jobs PromotionTrigger
5+
dependencies:
6+
- path: .yamato/wrench/api-validation-jobs.yml#all_api_validation_jobs
7+
- path: .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
8+
- path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_netcode_gameobjects
9+
triggers:
10+
expression: push.branch match "^release/.*"
11+
cancel_old_ci: true
12+

‎.yamato/wrench/recipe-regeneration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
2626
cancel_old_ci: true
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 0.10.38.0
29+
Wrench: 0.10.40.0
3030

‎.yamato/wrench/validation-jobs.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos:
6060
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
6161
variables:
6262
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
63-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
63+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
6464
metadata:
6565
Job Maintainers: '#rm-packageworks'
66-
Wrench: 0.10.38.0
66+
Wrench: 0.10.40.0
6767
labels:
6868
- Packages:netcode.gameobjects
6969

@@ -126,10 +126,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu:
126126
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
127127
variables:
128128
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
129-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
129+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
130130
metadata:
131131
Job Maintainers: '#rm-packageworks'
132-
Wrench: 0.10.38.0
132+
Wrench: 0.10.40.0
133133
labels:
134134
- Packages:netcode.gameobjects
135135

@@ -192,10 +192,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows:
192192
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
193193
variables:
194194
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
195-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
195+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
196196
metadata:
197197
Job Maintainers: '#rm-packageworks'
198-
Wrench: 0.10.38.0
198+
Wrench: 0.10.40.0
199199
labels:
200200
- Packages:netcode.gameobjects
201201

@@ -258,10 +258,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_macos:
258258
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
259259
variables:
260260
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
261-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
261+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
262262
metadata:
263263
Job Maintainers: '#rm-packageworks'
264-
Wrench: 0.10.38.0
264+
Wrench: 0.10.40.0
265265
labels:
266266
- Packages:netcode.gameobjects
267267

@@ -324,10 +324,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_ubuntu:
324324
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
325325
variables:
326326
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
327-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
327+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
328328
metadata:
329329
Job Maintainers: '#rm-packageworks'
330-
Wrench: 0.10.38.0
330+
Wrench: 0.10.40.0
331331
labels:
332332
- Packages:netcode.gameobjects
333333

@@ -390,10 +390,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_windows:
390390
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
391391
variables:
392392
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
393-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
393+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
394394
metadata:
395395
Job Maintainers: '#rm-packageworks'
396-
Wrench: 0.10.38.0
396+
Wrench: 0.10.40.0
397397
labels:
398398
- Packages:netcode.gameobjects
399399

@@ -456,10 +456,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos:
456456
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
457457
variables:
458458
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
459-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
459+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
460460
metadata:
461461
Job Maintainers: '#rm-packageworks'
462-
Wrench: 0.10.38.0
462+
Wrench: 0.10.40.0
463463
labels:
464464
- Packages:netcode.gameobjects
465465

@@ -522,10 +522,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu:
522522
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
523523
variables:
524524
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
525-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
525+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
526526
metadata:
527527
Job Maintainers: '#rm-packageworks'
528-
Wrench: 0.10.38.0
528+
Wrench: 0.10.40.0
529529
labels:
530530
- Packages:netcode.gameobjects
531531

@@ -588,10 +588,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows:
588588
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
589589
variables:
590590
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
591-
UPMPVP_CONTEXT_WRENCH: 0.10.38.0
591+
UPMPVP_CONTEXT_WRENCH: 0.10.40.0
592592
metadata:
593593
Job Maintainers: '#rm-packageworks'
594-
Wrench: 0.10.38.0
594+
Wrench: 0.10.40.0
595595
labels:
596596
- Packages:netcode.gameobjects
597597

‎.yamato/wrench/wrench_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
3333
"branch_pattern": "ReleaseSlash",
34-
"wrench_version": "0.10.38.0",
34+
"wrench_version": "0.10.40.0",
3535
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
3636
"cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
3737
}

0 commit comments

Comments
 (0)