Skip to content

Commit 404b38e

Browse files
authored
CHANGE: Update ubuntu image to 22.04 (#2224)
1 parent f9ea658 commit 404b38e

File tree

8 files changed

+37
-36
lines changed

8 files changed

+37
-36
lines changed

.yamato/config.metadata

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ platforms_nix:
5858
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
5959
- name: linux
6060
type: Unity::VM
61-
image: package-ci/ubuntu-20.04:v4
61+
image: package-ci/ubuntu-22.04:v4
6262
flavor: b1.large
6363
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
6464
- name: linux_standalone
6565
type: Unity::VM
66-
image: package-ci/ubuntu-20.04:v4
66+
image: package-ci/ubuntu-22.04:v4
6767
flavor: b1.large
6868
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
6969
runtime: StandaloneLinux64
7070
- name: linux_standalone_il2cpp
7171
type: Unity::VM
72-
image: package-ci/ubuntu-20.04:v4
72+
image: package-ci/ubuntu-22.04:v4
7373
flavor: b1.large
7474
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
7575
runtime: StandaloneLinux64

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ all_api_validation_jobs:
99
api_validation_-_inputsystem_-_2021_3_-_windows:
1010
name: API Validation - inputsystem - 2021.3 - windows
1111
agent:
12-
image: package-ci/win10:v4
12+
image: package-ci/win10:default
1313
type: Unity::VM
1414
flavor: b1.large
1515
commands:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package_pack_-_inputsystem:
66
name: Package Pack - inputsystem
77
agent:
8-
image: package-ci/ubuntu-20.04:v4
8+
image: package-ci/ubuntu-22.04:default
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ preview_apv_-_2021_3_-_macos:
8585
preview_apv_-_2021_3_-_ubuntu:
8686
name: Preview APV - 2021.3 - ubuntu
8787
agent:
88-
image: package-ci/ubuntu-20.04:default
88+
image: package-ci/ubuntu-22.04:default
8989
type: Unity::VM
9090
flavor: b1.large
9191
commands:
@@ -248,7 +248,7 @@ preview_apv_-_2022_3_-_macos:
248248
preview_apv_-_2022_3_-_ubuntu:
249249
name: Preview APV - 2022.3 - ubuntu
250250
agent:
251-
image: package-ci/ubuntu-20.04:default
251+
image: package-ci/ubuntu-22.04:default
252252
type: Unity::VM
253253
flavor: b1.large
254254
commands:
@@ -411,7 +411,7 @@ preview_apv_-_6000_0_-_macos:
411411
preview_apv_-_6000_0_-_ubuntu:
412412
name: Preview APV - 6000.0 - ubuntu
413413
agent:
414-
image: package-ci/ubuntu-20.04:default
414+
image: package-ci/ubuntu-22.04:default
415415
type: Unity::VM
416416
flavor: b1.large
417417
commands:
@@ -574,7 +574,7 @@ preview_apv_-_6000_1_-_macos:
574574
preview_apv_-_6000_1_-_ubuntu:
575575
name: Preview APV - 6000.1 - ubuntu
576576
agent:
577-
image: package-ci/ubuntu-20.04:default
577+
image: package-ci/ubuntu-22.04:default
578578
type: Unity::VM
579579
flavor: b1.large
580580
commands:
@@ -737,7 +737,7 @@ preview_apv_-_6000_2_-_macos:
737737
preview_apv_-_6000_2_-_ubuntu:
738738
name: Preview APV - 6000.2 - ubuntu
739739
agent:
740-
image: package-ci/ubuntu-20.04:default
740+
image: package-ci/ubuntu-22.04:default
741741
type: Unity::VM
742742
flavor: b1.large
743743
commands:
@@ -900,7 +900,7 @@ preview_apv_-_6000_3_-_macos:
900900
preview_apv_-_6000_3_-_ubuntu:
901901
name: Preview APV - 6000.3 - ubuntu
902902
agent:
903-
image: package-ci/ubuntu-20.04:default
903+
image: package-ci/ubuntu-22.04:default
904904
type: Unity::VM
905905
flavor: b1.large
906906
commands:

.yamato/wrench/promotion-jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
publish_dry_run_inputsystem:
66
name: Publish Dry Run inputsystem
77
agent:
8-
image: package-ci/ubuntu-20.04:default
8+
image: package-ci/ubuntu-22.04:default
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
@@ -217,7 +217,7 @@ publish_dry_run_inputsystem:
217217
publish_inputsystem:
218218
name: Publish inputsystem
219219
agent:
220-
image: package-ci/ubuntu-20.04:default
220+
image: package-ci/ubuntu-22.04:default
221221
type: Unity::VM
222222
flavor: b1.large
223223
commands:

.yamato/wrench/recipe-regeneration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
test_-_wrench_jobs_up_to_date:
66
name: Test - Wrench Jobs up to date
77
agent:
8-
image: package-ci/ubuntu-20.04:default
8+
image: package-ci/ubuntu-22.04:default
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:

.yamato/wrench/validation-jobs.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
validate_-_inputsystem_-_2021_3_-_macos:
66
name: Validate - inputsystem - 2021.3 - macos
77
agent:
8-
image: package-ci/macos-13:v4
8+
image: package-ci/macos-13:default
99
type: Unity::VM::osx
1010
flavor: b1.xlarge
1111
commands:
@@ -71,7 +71,7 @@ validate_-_inputsystem_-_2021_3_-_macos:
7171
validate_-_inputsystem_-_2021_3_-_ubuntu:
7272
name: Validate - inputsystem - 2021.3 - ubuntu
7373
agent:
74-
image: package-ci/ubuntu-20.04:v4
74+
image: package-ci/ubuntu-22.04:default
7575
type: Unity::VM
7676
flavor: b1.large
7777
commands:
@@ -137,7 +137,7 @@ validate_-_inputsystem_-_2021_3_-_ubuntu:
137137
validate_-_inputsystem_-_2021_3_-_windows:
138138
name: Validate - inputsystem - 2021.3 - windows
139139
agent:
140-
image: package-ci/win10:v4
140+
image: package-ci/win10:default
141141
type: Unity::VM
142142
flavor: b1.large
143143
commands:
@@ -203,7 +203,7 @@ validate_-_inputsystem_-_2021_3_-_windows:
203203
validate_-_inputsystem_-_2022_3_-_macos:
204204
name: Validate - inputsystem - 2022.3 - macos
205205
agent:
206-
image: package-ci/macos-13:v4
206+
image: package-ci/macos-13:default
207207
type: Unity::VM::osx
208208
flavor: b1.xlarge
209209
commands:
@@ -269,7 +269,7 @@ validate_-_inputsystem_-_2022_3_-_macos:
269269
validate_-_inputsystem_-_2022_3_-_ubuntu:
270270
name: Validate - inputsystem - 2022.3 - ubuntu
271271
agent:
272-
image: package-ci/ubuntu-20.04:v4
272+
image: package-ci/ubuntu-22.04:default
273273
type: Unity::VM
274274
flavor: b1.large
275275
commands:
@@ -335,7 +335,7 @@ validate_-_inputsystem_-_2022_3_-_ubuntu:
335335
validate_-_inputsystem_-_2022_3_-_windows:
336336
name: Validate - inputsystem - 2022.3 - windows
337337
agent:
338-
image: package-ci/win10:v4
338+
image: package-ci/win10:default
339339
type: Unity::VM
340340
flavor: b1.large
341341
commands:
@@ -401,7 +401,7 @@ validate_-_inputsystem_-_2022_3_-_windows:
401401
validate_-_inputsystem_-_6000_0_-_macos:
402402
name: Validate - inputsystem - 6000.0 - macos
403403
agent:
404-
image: package-ci/macos-13:v4
404+
image: package-ci/macos-13:default
405405
type: Unity::VM::osx
406406
flavor: b1.xlarge
407407
commands:
@@ -467,7 +467,7 @@ validate_-_inputsystem_-_6000_0_-_macos:
467467
validate_-_inputsystem_-_6000_0_-_ubuntu:
468468
name: Validate - inputsystem - 6000.0 - ubuntu
469469
agent:
470-
image: package-ci/ubuntu-20.04:v4
470+
image: package-ci/ubuntu-22.04:default
471471
type: Unity::VM
472472
flavor: b1.large
473473
commands:
@@ -533,7 +533,7 @@ validate_-_inputsystem_-_6000_0_-_ubuntu:
533533
validate_-_inputsystem_-_6000_0_-_windows:
534534
name: Validate - inputsystem - 6000.0 - windows
535535
agent:
536-
image: package-ci/win10:v4
536+
image: package-ci/win10:default
537537
type: Unity::VM
538538
flavor: b1.large
539539
commands:
@@ -599,7 +599,7 @@ validate_-_inputsystem_-_6000_0_-_windows:
599599
validate_-_inputsystem_-_6000_1_-_macos:
600600
name: Validate - inputsystem - 6000.1 - macos
601601
agent:
602-
image: package-ci/macos-13:v4
602+
image: package-ci/macos-13:default
603603
type: Unity::VM::osx
604604
flavor: b1.xlarge
605605
commands:
@@ -665,7 +665,7 @@ validate_-_inputsystem_-_6000_1_-_macos:
665665
validate_-_inputsystem_-_6000_1_-_ubuntu:
666666
name: Validate - inputsystem - 6000.1 - ubuntu
667667
agent:
668-
image: package-ci/ubuntu-20.04:v4
668+
image: package-ci/ubuntu-22.04:default
669669
type: Unity::VM
670670
flavor: b1.large
671671
commands:
@@ -731,7 +731,7 @@ validate_-_inputsystem_-_6000_1_-_ubuntu:
731731
validate_-_inputsystem_-_6000_1_-_windows:
732732
name: Validate - inputsystem - 6000.1 - windows
733733
agent:
734-
image: package-ci/win10:v4
734+
image: package-ci/win10:default
735735
type: Unity::VM
736736
flavor: b1.large
737737
commands:
@@ -797,7 +797,7 @@ validate_-_inputsystem_-_6000_1_-_windows:
797797
validate_-_inputsystem_-_6000_2_-_macos:
798798
name: Validate - inputsystem - 6000.2 - macos
799799
agent:
800-
image: package-ci/macos-13:v4
800+
image: package-ci/macos-13:default
801801
type: Unity::VM::osx
802802
flavor: b1.xlarge
803803
commands:
@@ -863,7 +863,7 @@ validate_-_inputsystem_-_6000_2_-_macos:
863863
validate_-_inputsystem_-_6000_2_-_ubuntu:
864864
name: Validate - inputsystem - 6000.2 - ubuntu
865865
agent:
866-
image: package-ci/ubuntu-20.04:v4
866+
image: package-ci/ubuntu-22.04:default
867867
type: Unity::VM
868868
flavor: b1.large
869869
commands:
@@ -929,7 +929,7 @@ validate_-_inputsystem_-_6000_2_-_ubuntu:
929929
validate_-_inputsystem_-_6000_2_-_windows:
930930
name: Validate - inputsystem - 6000.2 - windows
931931
agent:
932-
image: package-ci/win10:v4
932+
image: package-ci/win10:default
933933
type: Unity::VM
934934
flavor: b1.large
935935
commands:
@@ -995,7 +995,7 @@ validate_-_inputsystem_-_6000_2_-_windows:
995995
validate_-_inputsystem_-_6000_3_-_macos:
996996
name: Validate - inputsystem - 6000.3 - macos
997997
agent:
998-
image: package-ci/macos-13:v4
998+
image: package-ci/macos-13:default
999999
type: Unity::VM::osx
10001000
flavor: b1.xlarge
10011001
commands:
@@ -1061,7 +1061,7 @@ validate_-_inputsystem_-_6000_3_-_macos:
10611061
validate_-_inputsystem_-_6000_3_-_ubuntu:
10621062
name: Validate - inputsystem - 6000.3 - ubuntu
10631063
agent:
1064-
image: package-ci/ubuntu-20.04:v4
1064+
image: package-ci/ubuntu-22.04:default
10651065
type: Unity::VM
10661066
flavor: b1.large
10671067
commands:
@@ -1127,7 +1127,7 @@ validate_-_inputsystem_-_6000_3_-_ubuntu:
11271127
validate_-_inputsystem_-_6000_3_-_windows:
11281128
name: Validate - inputsystem - 6000.3 - windows
11291129
agent:
1130-
image: package-ci/win10:v4
1130+
image: package-ci/win10:default
11311131
type: Unity::VM
11321132
flavor: b1.large
11331133
commands:

Tools/CI/Settings/InputSystemSettings.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,11 @@ public InputSystemSettings()
6262
wrenchCsProjectPath: "/Tools/CI/InputSystem.Cookbook.csproj",
6363
useLocalPvpExemptions: true
6464
);
65-
66-
// change default images as per Dictionary above.
67-
Wrench.Packages["com.unity.inputsystem"].EditorPlatforms = ImageOverrides;
68-
65+
66+
var defaultUbuntuPlatform = WrenchPackage.DefaultEditorPlatforms[SystemType.Ubuntu];
67+
// Use Ubuntu image package-ci/ubuntu-22.04.
68+
Wrench.Packages["com.unity.inputsystem"].EditorPlatforms[SystemType.Ubuntu] = new Platform(new Agent("package-ci/ubuntu-22.04:default", defaultUbuntuPlatform.Agent.Flavor, defaultUbuntuPlatform.Agent.Resource), defaultUbuntuPlatform.System);
69+
6970
// ignore packages listed below in PreviewAPV
7071
Wrench.Packages["com.unity.inputsystem"].DependantsToIgnoreInPreviewApv = new Dictionary<Editor, ISet<string>>()
7172
{

0 commit comments

Comments
 (0)