diff --git a/.yamato/input-system-mobile-functional-tests.yml b/.yamato/input-system-mobile-functional-tests.yml index a689daa361..f69ec3096f 100644 --- a/.yamato/input-system-mobile-functional-tests.yml +++ b/.yamato/input-system-mobile-functional-tests.yml @@ -25,6 +25,8 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 2022.3 - Android - mono inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono: @@ -51,6 +53,8 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 2022.3 - IOS inputsystem-mobilefunctionaltests_-_2022_3_-_ios: @@ -119,6 +123,8 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.0 - Android - mono inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono: @@ -145,6 +151,8 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.0 - IOS inputsystem-mobilefunctionaltests_-_6000_0_-_ios: @@ -213,6 +221,8 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.2 - Android - mono inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono: @@ -239,6 +249,8 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.2 - IOS inputsystem-mobilefunctionaltests_-_6000_2_-_ios: @@ -307,6 +319,8 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.3 - Android - mono inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono: @@ -333,6 +347,8 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.3 - IOS inputsystem-mobilefunctionaltests_-_6000_3_-_ios: @@ -401,6 +417,8 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.4 - Android - mono inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono: @@ -427,6 +445,8 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.4 - IOS inputsystem-mobilefunctionaltests_-_6000_4_-_ios: @@ -495,6 +515,8 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.5 - Android - mono inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono: @@ -521,6 +543,8 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobileFunctionalTests - 6000.5 - IOS inputsystem-mobilefunctionaltests_-_6000_5_-_ios: diff --git a/.yamato/input-system-mobile-performance-tests.yml b/.yamato/input-system-mobile-performance-tests.yml index d94e69e4b2..2b9ef42a92 100644 --- a/.yamato/input-system-mobile-performance-tests.yml +++ b/.yamato/input-system-mobile-performance-tests.yml @@ -25,6 +25,8 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 2022.3 - Android - mono inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono: @@ -51,6 +53,8 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 2022.3 - IOS inputsystem-mobileperformancetests_-_2022_3_-_ios: @@ -119,6 +123,8 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.0 - Android - mono inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono: @@ -145,6 +151,8 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.0 - IOS inputsystem-mobileperformancetests_-_6000_0_-_ios: @@ -213,6 +221,8 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.2 - Android - mono inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono: @@ -239,6 +249,8 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.2 - IOS inputsystem-mobileperformancetests_-_6000_2_-_ios: @@ -307,6 +319,8 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.3 - Android - mono inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono: @@ -333,6 +347,8 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.3 - IOS inputsystem-mobileperformancetests_-_6000_3_-_ios: @@ -401,6 +417,8 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.4 - Android - mono inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono: @@ -427,6 +445,8 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.4 - IOS inputsystem-mobileperformancetests_-_6000_4_-_ios: @@ -495,6 +515,8 @@ inputsystem-mobileperformancetests_-_6000_5_-_android_-_il2cpp: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_il2cpp + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.5 - Android - mono inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono: @@ -521,6 +543,8 @@ inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono: - build/test-results/**/* dependencies: - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_mono + variables: + UTR_VERSION: 1.42.0 # InputSystem-MobilePerformanceTests - 6000.5 - IOS inputsystem-mobileperformancetests_-_6000_5_-_ios: diff --git a/Tools/CI/Recipes/MobileBaseRecipe.cs b/Tools/CI/Recipes/MobileBaseRecipe.cs index a2f6d57165..0d8fbaea22 100644 --- a/Tools/CI/Recipes/MobileBaseRecipe.cs +++ b/Tools/CI/Recipes/MobileBaseRecipe.cs @@ -6,7 +6,7 @@ namespace InputSystem.Cookbook.Recipes; -public abstract class MobileBaseRecipe: BaseRecipe +public abstract class MobileBaseRecipe : BaseRecipe { public override IEnumerable GetJobs() { @@ -57,6 +57,9 @@ protected string PrepareUtrExecutable(IJobBuilder job, SystemType systemType) break; job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); job.WithCommands(UtrCommand.Download(systemType, "utr.bat")); + // Yet another temporary fix. UTR 1.43.0 was failing on Android builds due to some internal issue so + // we are forcing UTR version 1.42.0 for Android platform. + job.WithEnvironmentVariable("UTR_VERSION", "1.42.0"); return "utr.bat"; case SystemType.IOS: job.WithCommands(UtrCommand.Download(systemType, "utr")); @@ -68,4 +71,4 @@ protected string PrepareUtrExecutable(IJobBuilder job, SystemType systemType) return "UnifiedTestRunner"; } -} \ No newline at end of file +}