From 7c4063787f6895b4d552d6b0c663aadcab78ba78 Mon Sep 17 00:00:00 2001 From: "wind.xu" Date: Tue, 12 Aug 2025 14:25:51 -0400 Subject: [PATCH] Update ubuntu image to 22.04 --- .yamato/config.metadata | 6 ++-- .yamato/wrench/api-validation-jobs.yml | 2 +- .yamato/wrench/package-pack-jobs.yml | 2 +- .yamato/wrench/preview-a-p-v.yml | 12 ++++---- .yamato/wrench/promotion-jobs.yml | 4 +-- .yamato/wrench/recipe-regeneration.yml | 2 +- .yamato/wrench/validation-jobs.yml | 36 ++++++++++++------------ Tools/CI/Settings/InputSystemSettings.cs | 9 +++--- 8 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 87de11d39d..a61f44718d 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -58,18 +58,18 @@ platforms_nix: installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u - name: linux type: Unity::VM - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:v4 flavor: b1.large instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0 - name: linux_standalone type: Unity::VM - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:v4 flavor: b1.large instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0 runtime: StandaloneLinux64 - name: linux_standalone_il2cpp type: Unity::VM - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:v4 flavor: b1.large instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0 runtime: StandaloneLinux64 diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml index 36a710b304..2c8a6a691b 100644 --- a/.yamato/wrench/api-validation-jobs.yml +++ b/.yamato/wrench/api-validation-jobs.yml @@ -9,7 +9,7 @@ all_api_validation_jobs: api_validation_-_inputsystem_-_2021_3_-_windows: name: API Validation - inputsystem - 2021.3 - windows agent: - image: package-ci/win10:v4 + image: package-ci/win10:default type: Unity::VM flavor: b1.large commands: diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index def59faaf0..135f2ceef5 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -5,7 +5,7 @@ package_pack_-_inputsystem: name: Package Pack - inputsystem agent: - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml index ad66693732..96852f441d 100644 --- a/.yamato/wrench/preview-a-p-v.yml +++ b/.yamato/wrench/preview-a-p-v.yml @@ -85,7 +85,7 @@ preview_apv_-_2021_3_-_macos: preview_apv_-_2021_3_-_ubuntu: name: Preview APV - 2021.3 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -248,7 +248,7 @@ preview_apv_-_2022_3_-_macos: preview_apv_-_2022_3_-_ubuntu: name: Preview APV - 2022.3 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -411,7 +411,7 @@ preview_apv_-_6000_0_-_macos: preview_apv_-_6000_0_-_ubuntu: name: Preview APV - 6000.0 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -574,7 +574,7 @@ preview_apv_-_6000_1_-_macos: preview_apv_-_6000_1_-_ubuntu: name: Preview APV - 6000.1 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -737,7 +737,7 @@ preview_apv_-_6000_2_-_macos: preview_apv_-_6000_2_-_ubuntu: name: Preview APV - 6000.2 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -900,7 +900,7 @@ preview_apv_-_6000_3_-_macos: preview_apv_-_6000_3_-_ubuntu: name: Preview APV - 6000.3 - ubuntu agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml index 88561a075b..05fdcb5960 100644 --- a/.yamato/wrench/promotion-jobs.yml +++ b/.yamato/wrench/promotion-jobs.yml @@ -5,7 +5,7 @@ publish_dry_run_inputsystem: name: Publish Dry Run inputsystem agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -217,7 +217,7 @@ publish_dry_run_inputsystem: publish_inputsystem: name: Publish inputsystem agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml index 09637ffc9b..1ff3d3fdb6 100644 --- a/.yamato/wrench/recipe-regeneration.yml +++ b/.yamato/wrench/recipe-regeneration.yml @@ -5,7 +5,7 @@ test_-_wrench_jobs_up_to_date: name: Test - Wrench Jobs up to date agent: - image: package-ci/ubuntu-20.04:default + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml index a1d96eda0b..7a060cd35e 100644 --- a/.yamato/wrench/validation-jobs.yml +++ b/.yamato/wrench/validation-jobs.yml @@ -5,7 +5,7 @@ validate_-_inputsystem_-_2021_3_-_macos: name: Validate - inputsystem - 2021.3 - macos agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13:default type: Unity::VM::osx flavor: b1.xlarge commands: @@ -71,7 +71,7 @@ validate_-_inputsystem_-_2021_3_-_macos: validate_-_inputsystem_-_2021_3_-_ubuntu: name: Validate - inputsystem - 2021.3 - ubuntu agent: - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -137,7 +137,7 @@ validate_-_inputsystem_-_2021_3_-_ubuntu: validate_-_inputsystem_-_2021_3_-_windows: name: Validate - inputsystem - 2021.3 - windows agent: - image: package-ci/win10:v4 + image: package-ci/win10:default type: Unity::VM flavor: b1.large commands: @@ -203,7 +203,7 @@ validate_-_inputsystem_-_2021_3_-_windows: validate_-_inputsystem_-_2022_3_-_macos: name: Validate - inputsystem - 2022.3 - macos agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13:default type: Unity::VM::osx flavor: b1.xlarge commands: @@ -269,7 +269,7 @@ validate_-_inputsystem_-_2022_3_-_macos: validate_-_inputsystem_-_2022_3_-_ubuntu: name: Validate - inputsystem - 2022.3 - ubuntu agent: - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -335,7 +335,7 @@ validate_-_inputsystem_-_2022_3_-_ubuntu: validate_-_inputsystem_-_2022_3_-_windows: name: Validate - inputsystem - 2022.3 - windows agent: - image: package-ci/win10:v4 + image: package-ci/win10:default type: Unity::VM flavor: b1.large commands: @@ -401,7 +401,7 @@ validate_-_inputsystem_-_2022_3_-_windows: validate_-_inputsystem_-_6000_0_-_macos: name: Validate - inputsystem - 6000.0 - macos agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13:default type: Unity::VM::osx flavor: b1.xlarge commands: @@ -467,7 +467,7 @@ validate_-_inputsystem_-_6000_0_-_macos: validate_-_inputsystem_-_6000_0_-_ubuntu: name: Validate - inputsystem - 6000.0 - ubuntu agent: - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -533,7 +533,7 @@ validate_-_inputsystem_-_6000_0_-_ubuntu: validate_-_inputsystem_-_6000_0_-_windows: name: Validate - inputsystem - 6000.0 - windows agent: - image: package-ci/win10:v4 + image: package-ci/win10:default type: Unity::VM flavor: b1.large commands: @@ -599,7 +599,7 @@ validate_-_inputsystem_-_6000_0_-_windows: validate_-_inputsystem_-_6000_1_-_macos: name: Validate - inputsystem - 6000.1 - macos agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13:default type: Unity::VM::osx flavor: b1.xlarge commands: @@ -665,7 +665,7 @@ validate_-_inputsystem_-_6000_1_-_macos: validate_-_inputsystem_-_6000_1_-_ubuntu: name: Validate - inputsystem - 6000.1 - ubuntu agent: - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -731,7 +731,7 @@ validate_-_inputsystem_-_6000_1_-_ubuntu: validate_-_inputsystem_-_6000_1_-_windows: name: Validate - inputsystem - 6000.1 - windows agent: - image: package-ci/win10:v4 + image: package-ci/win10:default type: Unity::VM flavor: b1.large commands: @@ -797,7 +797,7 @@ validate_-_inputsystem_-_6000_1_-_windows: validate_-_inputsystem_-_6000_2_-_macos: name: Validate - inputsystem - 6000.2 - macos agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13:default type: Unity::VM::osx flavor: b1.xlarge commands: @@ -863,7 +863,7 @@ validate_-_inputsystem_-_6000_2_-_macos: validate_-_inputsystem_-_6000_2_-_ubuntu: name: Validate - inputsystem - 6000.2 - ubuntu agent: - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -929,7 +929,7 @@ validate_-_inputsystem_-_6000_2_-_ubuntu: validate_-_inputsystem_-_6000_2_-_windows: name: Validate - inputsystem - 6000.2 - windows agent: - image: package-ci/win10:v4 + image: package-ci/win10:default type: Unity::VM flavor: b1.large commands: @@ -995,7 +995,7 @@ validate_-_inputsystem_-_6000_2_-_windows: validate_-_inputsystem_-_6000_3_-_macos: name: Validate - inputsystem - 6000.3 - macos agent: - image: package-ci/macos-13:v4 + image: package-ci/macos-13:default type: Unity::VM::osx flavor: b1.xlarge commands: @@ -1061,7 +1061,7 @@ validate_-_inputsystem_-_6000_3_-_macos: validate_-_inputsystem_-_6000_3_-_ubuntu: name: Validate - inputsystem - 6000.3 - ubuntu agent: - image: package-ci/ubuntu-20.04:v4 + image: package-ci/ubuntu-22.04:default type: Unity::VM flavor: b1.large commands: @@ -1127,7 +1127,7 @@ validate_-_inputsystem_-_6000_3_-_ubuntu: validate_-_inputsystem_-_6000_3_-_windows: name: Validate - inputsystem - 6000.3 - windows agent: - image: package-ci/win10:v4 + image: package-ci/win10:default type: Unity::VM flavor: b1.large commands: diff --git a/Tools/CI/Settings/InputSystemSettings.cs b/Tools/CI/Settings/InputSystemSettings.cs index 1ff9e8466a..3ad9db3a15 100644 --- a/Tools/CI/Settings/InputSystemSettings.cs +++ b/Tools/CI/Settings/InputSystemSettings.cs @@ -62,10 +62,11 @@ public InputSystemSettings() wrenchCsProjectPath: "/Tools/CI/InputSystem.Cookbook.csproj", useLocalPvpExemptions: true ); - - // change default images as per Dictionary above. - Wrench.Packages["com.unity.inputsystem"].EditorPlatforms = ImageOverrides; - + + var defaultUbuntuPlatform = WrenchPackage.DefaultEditorPlatforms[SystemType.Ubuntu]; + // Use Ubuntu image package-ci/ubuntu-22.04. + 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); + // ignore packages listed below in PreviewAPV Wrench.Packages["com.unity.inputsystem"].DependantsToIgnoreInPreviewApv = new Dictionary>() {