Skip to content

Commit b2038a7

Browse files
michalChrobotmichalChrobot
authored
ci: [develop] Wrench 2.0 update backport (#3883)
* ci: Wrench update to v2.2.0 (#3881) Updated Wrench to 2.2.0 and regenerated recipes * Regenerated CI
1 parent e1bb4d2 commit b2038a7

File tree

11 files changed

+159
-146
lines changed

11 files changed

+159
-146
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
all_api_validation_jobs:
44
name: All API Validation Jobs
55
dependencies:
6-
- path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2022_3_-_windows
6+
- path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_2022_3_-_win10
77

8-
# upm-ci validation tests for API Validation - netcode.gameobjects - 2022.3 - windows (2022.3 - Windows).
9-
api_validation_-_netcode_gameobjects_-_2022_3_-_windows:
10-
name: API Validation - netcode.gameobjects - 2022.3 - windows
8+
# upm-ci validation tests for API Validation - netcode.gameobjects - 2022.3 - win10 (2022.3 - Windows).
9+
api_validation_-_netcode_gameobjects_-_2022_3_-_win10:
10+
name: API Validation - netcode.gameobjects - 2022.3 - win10
1111
agent:
12-
image: package-ci/win10:default
12+
image: package-ci/win10:v4
1313
type: Unity::VM
14-
flavor: b1.large
14+
flavor: b1.xlarge
1515
commands:
1616
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
1717
- command: 7z x -aoa wrench-localapv.zip
@@ -55,8 +55,8 @@ api_validation_-_netcode_gameobjects_-_2022_3_-_windows:
5555
UNITY_LICENSING_SERVER_DELETE_NUL: 0
5656
UNITY_LICENSING_SERVER_DELETE_ULF: 0
5757
UNITY_LICENSING_SERVER_TOOLSET: pro
58-
UPMPVP_CONTEXT_WRENCH: 1.4.8.0
58+
UPMPVP_CONTEXT_WRENCH: 2.2.0.0
5959
metadata:
6060
Job Maintainers: '#rm-packageworks'
61-
Wrench: 1.4.8.0
61+
Wrench: 2.2.0.0
6262

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package_pack_-_netcode_gameobjects:
66
name: Package Pack - netcode.gameobjects
77
agent:
8-
image: package-ci/ubuntu-20.04:default
8+
image: package-ci/ubuntu-22.04:v4
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 1.4.8.0
27+
Wrench: 2.2.0.0
2828

‎.yamato/wrench/player-build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
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+
{}
4+

‎.yamato/wrench/player-test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
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+
{}
4+

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
all_preview_apv_jobs:
66
name: All Preview APV Jobs
77
dependencies:
8-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_macos
9-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_ubuntu
10-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_windows
11-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos
12-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu
13-
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_windows
8+
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_macos13
9+
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_ubuntu1804
10+
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_win10
11+
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos13
12+
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu2204
13+
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_win10
1414
metadata:
1515
Job Maintainers: '#rm-packageworks'
16-
Wrench: 1.4.8.0
16+
Wrench: 2.2.0.0
1717

1818
# Functional tests for dependents found in the latest 2022.3 manifest (MacOS).
19-
preview_apv_-_2022_3_-_macos:
20-
name: Preview APV - 2022.3 - macos
19+
preview_apv_-_2022_3_-_macos13:
20+
name: Preview APV - 2022.3 - macos13
2121
agent:
22-
image: package-ci/macos-13:default
22+
image: package-ci/macos-13:v4
2323
type: Unity::VM::osx
24-
flavor: b1.xlarge
24+
flavor: b1.large
2525
commands:
2626
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
2727
- command: 7z x -aoa wrench-localapv.zip
@@ -68,16 +68,16 @@ preview_apv_-_2022_3_-_macos:
6868
UNITY_LICENSING_SERVER_DELETE_NUL: 0
6969
UNITY_LICENSING_SERVER_DELETE_ULF: 0
7070
UNITY_LICENSING_SERVER_TOOLSET: pro
71-
UPMPVP_CONTEXT_WRENCH: 1.4.8.0
71+
UPMPVP_CONTEXT_WRENCH: 2.2.0.0
7272
metadata:
7373
Job Maintainers: '#rm-packageworks'
74-
Wrench: 1.4.8.0
74+
Wrench: 2.2.0.0
7575

7676
# Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu).
77-
preview_apv_-_2022_3_-_ubuntu:
78-
name: Preview APV - 2022.3 - ubuntu
77+
preview_apv_-_2022_3_-_ubuntu1804:
78+
name: Preview APV - 2022.3 - ubuntu1804
7979
agent:
80-
image: package-ci/ubuntu-20.04:default
80+
image: package-ci/ubuntu-18.04:v4
8181
type: Unity::VM
8282
flavor: b1.large
8383
commands:
@@ -126,18 +126,18 @@ preview_apv_-_2022_3_-_ubuntu:
126126
UNITY_LICENSING_SERVER_DELETE_NUL: 0
127127
UNITY_LICENSING_SERVER_DELETE_ULF: 0
128128
UNITY_LICENSING_SERVER_TOOLSET: pro
129-
UPMPVP_CONTEXT_WRENCH: 1.4.8.0
129+
UPMPVP_CONTEXT_WRENCH: 2.2.0.0
130130
metadata:
131131
Job Maintainers: '#rm-packageworks'
132-
Wrench: 1.4.8.0
132+
Wrench: 2.2.0.0
133133

134134
# Functional tests for dependents found in the latest 2022.3 manifest (Windows).
135-
preview_apv_-_2022_3_-_windows:
136-
name: Preview APV - 2022.3 - windows
135+
preview_apv_-_2022_3_-_win10:
136+
name: Preview APV - 2022.3 - win10
137137
agent:
138-
image: package-ci/win10:default
138+
image: package-ci/win10:v4
139139
type: Unity::VM
140-
flavor: b1.large
140+
flavor: b1.xlarge
141141
commands:
142142
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
143143
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
@@ -185,18 +185,18 @@ preview_apv_-_2022_3_-_windows:
185185
UNITY_LICENSING_SERVER_DELETE_NUL: 0
186186
UNITY_LICENSING_SERVER_DELETE_ULF: 0
187187
UNITY_LICENSING_SERVER_TOOLSET: pro
188-
UPMPVP_CONTEXT_WRENCH: 1.4.8.0
188+
UPMPVP_CONTEXT_WRENCH: 2.2.0.0
189189
metadata:
190190
Job Maintainers: '#rm-packageworks'
191-
Wrench: 1.4.8.0
191+
Wrench: 2.2.0.0
192192

193193
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
194-
preview_apv_-_6000_0_-_macos:
195-
name: Preview APV - 6000.0 - macos
194+
preview_apv_-_6000_0_-_macos13:
195+
name: Preview APV - 6000.0 - macos13
196196
agent:
197-
image: package-ci/macos-13:default
197+
image: package-ci/macos-13:v4
198198
type: Unity::VM::osx
199-
flavor: b1.xlarge
199+
flavor: b1.large
200200
commands:
201201
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
202202
- command: 7z x -aoa wrench-localapv.zip
@@ -243,14 +243,14 @@ preview_apv_-_6000_0_-_macos:
243243
UNITY_LICENSING_SERVER_DELETE_NUL: 0
244244
UNITY_LICENSING_SERVER_DELETE_ULF: 0
245245
UNITY_LICENSING_SERVER_TOOLSET: pro
246-
UPMPVP_CONTEXT_WRENCH: 1.4.8.0
246+
UPMPVP_CONTEXT_WRENCH: 2.2.0.0
247247
metadata:
248248
Job Maintainers: '#rm-packageworks'
249-
Wrench: 1.4.8.0
249+
Wrench: 2.2.0.0
250250

251251
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
252-
preview_apv_-_6000_0_-_ubuntu:
253-
name: Preview APV - 6000.0 - ubuntu
252+
preview_apv_-_6000_0_-_ubuntu2204:
253+
name: Preview APV - 6000.0 - ubuntu2204
254254
agent:
255255
image: package-ci/ubuntu-22.04:v4
256256
type: Unity::VM
@@ -301,18 +301,18 @@ preview_apv_-_6000_0_-_ubuntu:
301301
UNITY_LICENSING_SERVER_DELETE_NUL: 0
302302
UNITY_LICENSING_SERVER_DELETE_ULF: 0
303303
UNITY_LICENSING_SERVER_TOOLSET: pro
304-
UPMPVP_CONTEXT_WRENCH: 1.4.8.0
304+
UPMPVP_CONTEXT_WRENCH: 2.2.0.0
305305
metadata:
306306
Job Maintainers: '#rm-packageworks'
307-
Wrench: 1.4.8.0
307+
Wrench: 2.2.0.0
308308

309309
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
310-
preview_apv_-_6000_0_-_windows:
311-
name: Preview APV - 6000.0 - windows
310+
preview_apv_-_6000_0_-_win10:
311+
name: Preview APV - 6000.0 - win10
312312
agent:
313-
image: package-ci/win10:default
313+
image: package-ci/win10:v4
314314
type: Unity::VM
315-
flavor: b1.large
315+
flavor: b1.xlarge
316316
commands:
317317
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
318318
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
@@ -360,8 +360,8 @@ preview_apv_-_6000_0_-_windows:
360360
UNITY_LICENSING_SERVER_DELETE_NUL: 0
361361
UNITY_LICENSING_SERVER_DELETE_ULF: 0
362362
UNITY_LICENSING_SERVER_TOOLSET: pro
363-
UPMPVP_CONTEXT_WRENCH: 1.4.8.0
363+
UPMPVP_CONTEXT_WRENCH: 2.2.0.0
364364
metadata:
365365
Job Maintainers: '#rm-packageworks'
366-
Wrench: 1.4.8.0
366+
Wrench: 2.2.0.0
367367

0 commit comments

Comments
 (0)