Skip to content

Commit aaaf3cc

Browse files
jfreire-unityjfreire-unity
authored
CHANGE: Set Android jobs to use UTR 1.42 to fix currently failed jobs (#2297)
1 parent c79a0b5 commit aaaf3cc

File tree

3 files changed

+53
-2
lines changed

3 files changed

+53
-2
lines changed

‎.yamato/input-system-mobile-functional-tests.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_il2cpp:
2525
- build/test-results/**/*
2626
dependencies:
2727
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_android_-_il2cpp
28+
variables:
29+
UTR_VERSION: 1.42.0
2830

2931
# InputSystem-MobileFunctionalTests - 2022.3 - Android - mono
3032
inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono:
@@ -51,6 +53,8 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono:
5153
- build/test-results/**/*
5254
dependencies:
5355
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_android_-_mono
56+
variables:
57+
UTR_VERSION: 1.42.0
5458

5559
# InputSystem-MobileFunctionalTests - 2022.3 - IOS
5660
inputsystem-mobilefunctionaltests_-_2022_3_-_ios:
@@ -119,6 +123,8 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp:
119123
- build/test-results/**/*
120124
dependencies:
121125
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_android_-_il2cpp
126+
variables:
127+
UTR_VERSION: 1.42.0
122128

123129
# InputSystem-MobileFunctionalTests - 6000.0 - Android - mono
124130
inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono:
@@ -145,6 +151,8 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono:
145151
- build/test-results/**/*
146152
dependencies:
147153
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_android_-_mono
154+
variables:
155+
UTR_VERSION: 1.42.0
148156

149157
# InputSystem-MobileFunctionalTests - 6000.0 - IOS
150158
inputsystem-mobilefunctionaltests_-_6000_0_-_ios:
@@ -213,6 +221,8 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp:
213221
- build/test-results/**/*
214222
dependencies:
215223
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_il2cpp
224+
variables:
225+
UTR_VERSION: 1.42.0
216226

217227
# InputSystem-MobileFunctionalTests - 6000.2 - Android - mono
218228
inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono:
@@ -239,6 +249,8 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono:
239249
- build/test-results/**/*
240250
dependencies:
241251
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_mono
252+
variables:
253+
UTR_VERSION: 1.42.0
242254

243255
# InputSystem-MobileFunctionalTests - 6000.2 - IOS
244256
inputsystem-mobilefunctionaltests_-_6000_2_-_ios:
@@ -307,6 +319,8 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp:
307319
- build/test-results/**/*
308320
dependencies:
309321
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_il2cpp
322+
variables:
323+
UTR_VERSION: 1.42.0
310324

311325
# InputSystem-MobileFunctionalTests - 6000.3 - Android - mono
312326
inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono:
@@ -333,6 +347,8 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono:
333347
- build/test-results/**/*
334348
dependencies:
335349
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_mono
350+
variables:
351+
UTR_VERSION: 1.42.0
336352

337353
# InputSystem-MobileFunctionalTests - 6000.3 - IOS
338354
inputsystem-mobilefunctionaltests_-_6000_3_-_ios:
@@ -401,6 +417,8 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_il2cpp:
401417
- build/test-results/**/*
402418
dependencies:
403419
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_android_-_il2cpp
420+
variables:
421+
UTR_VERSION: 1.42.0
404422

405423
# InputSystem-MobileFunctionalTests - 6000.4 - Android - mono
406424
inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono:
@@ -427,6 +445,8 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono:
427445
- build/test-results/**/*
428446
dependencies:
429447
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_android_-_mono
448+
variables:
449+
UTR_VERSION: 1.42.0
430450

431451
# InputSystem-MobileFunctionalTests - 6000.4 - IOS
432452
inputsystem-mobilefunctionaltests_-_6000_4_-_ios:
@@ -495,6 +515,8 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_il2cpp:
495515
- build/test-results/**/*
496516
dependencies:
497517
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_il2cpp
518+
variables:
519+
UTR_VERSION: 1.42.0
498520

499521
# InputSystem-MobileFunctionalTests - 6000.5 - Android - mono
500522
inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono:
@@ -521,6 +543,8 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_android_-_mono:
521543
- build/test-results/**/*
522544
dependencies:
523545
- path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_android_-_mono
546+
variables:
547+
UTR_VERSION: 1.42.0
524548

525549
# InputSystem-MobileFunctionalTests - 6000.5 - IOS
526550
inputsystem-mobilefunctionaltests_-_6000_5_-_ios:

‎.yamato/input-system-mobile-performance-tests.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_il2cpp:
2525
- build/test-results/**/*
2626
dependencies:
2727
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_android_-_il2cpp
28+
variables:
29+
UTR_VERSION: 1.42.0
2830

2931
# InputSystem-MobilePerformanceTests - 2022.3 - Android - mono
3032
inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono:
@@ -51,6 +53,8 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono:
5153
- build/test-results/**/*
5254
dependencies:
5355
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_android_-_mono
56+
variables:
57+
UTR_VERSION: 1.42.0
5458

5559
# InputSystem-MobilePerformanceTests - 2022.3 - IOS
5660
inputsystem-mobileperformancetests_-_2022_3_-_ios:
@@ -119,6 +123,8 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp:
119123
- build/test-results/**/*
120124
dependencies:
121125
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_android_-_il2cpp
126+
variables:
127+
UTR_VERSION: 1.42.0
122128

123129
# InputSystem-MobilePerformanceTests - 6000.0 - Android - mono
124130
inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono:
@@ -145,6 +151,8 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono:
145151
- build/test-results/**/*
146152
dependencies:
147153
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_android_-_mono
154+
variables:
155+
UTR_VERSION: 1.42.0
148156

149157
# InputSystem-MobilePerformanceTests - 6000.0 - IOS
150158
inputsystem-mobileperformancetests_-_6000_0_-_ios:
@@ -213,6 +221,8 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_il2cpp:
213221
- build/test-results/**/*
214222
dependencies:
215223
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_il2cpp
224+
variables:
225+
UTR_VERSION: 1.42.0
216226

217227
# InputSystem-MobilePerformanceTests - 6000.2 - Android - mono
218228
inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono:
@@ -239,6 +249,8 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono:
239249
- build/test-results/**/*
240250
dependencies:
241251
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_android_-_mono
252+
variables:
253+
UTR_VERSION: 1.42.0
242254

243255
# InputSystem-MobilePerformanceTests - 6000.2 - IOS
244256
inputsystem-mobileperformancetests_-_6000_2_-_ios:
@@ -307,6 +319,8 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp:
307319
- build/test-results/**/*
308320
dependencies:
309321
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_android_-_il2cpp
322+
variables:
323+
UTR_VERSION: 1.42.0
310324

311325
# InputSystem-MobilePerformanceTests - 6000.3 - Android - mono
312326
inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono:
@@ -333,6 +347,8 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono:
333347
- build/test-results/**/*
334348
dependencies:
335349
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_android_-_mono
350+
variables:
351+
UTR_VERSION: 1.42.0
336352

337353
# InputSystem-MobilePerformanceTests - 6000.3 - IOS
338354
inputsystem-mobileperformancetests_-_6000_3_-_ios:
@@ -401,6 +417,8 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_il2cpp:
401417
- build/test-results/**/*
402418
dependencies:
403419
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_android_-_il2cpp
420+
variables:
421+
UTR_VERSION: 1.42.0
404422

405423
# InputSystem-MobilePerformanceTests - 6000.4 - Android - mono
406424
inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono:
@@ -427,6 +445,8 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono:
427445
- build/test-results/**/*
428446
dependencies:
429447
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_android_-_mono
448+
variables:
449+
UTR_VERSION: 1.42.0
430450

431451
# InputSystem-MobilePerformanceTests - 6000.4 - IOS
432452
inputsystem-mobileperformancetests_-_6000_4_-_ios:
@@ -495,6 +515,8 @@ inputsystem-mobileperformancetests_-_6000_5_-_android_-_il2cpp:
495515
- build/test-results/**/*
496516
dependencies:
497517
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_il2cpp
518+
variables:
519+
UTR_VERSION: 1.42.0
498520

499521
# InputSystem-MobilePerformanceTests - 6000.5 - Android - mono
500522
inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono:
@@ -521,6 +543,8 @@ inputsystem-mobileperformancetests_-_6000_5_-_android_-_mono:
521543
- build/test-results/**/*
522544
dependencies:
523545
- path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_android_-_mono
546+
variables:
547+
UTR_VERSION: 1.42.0
524548

525549
# InputSystem-MobilePerformanceTests - 6000.5 - IOS
526550
inputsystem-mobileperformancetests_-_6000_5_-_ios:

‎Tools/CI/Recipes/MobileBaseRecipe.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace InputSystem.Cookbook.Recipes;
88

9-
public abstract class MobileBaseRecipe: BaseRecipe
9+
public abstract class MobileBaseRecipe : BaseRecipe
1010
{
1111
public override IEnumerable<IJobBuilder> GetJobs()
1212
{
@@ -57,6 +57,9 @@ protected string PrepareUtrExecutable(IJobBuilder job, SystemType systemType)
5757
break;
5858
job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands);
5959
job.WithCommands(UtrCommand.Download(systemType, "utr.bat"));
60+
// Yet another temporary fix. UTR 1.43.0 was failing on Android builds due to some internal issue so
61+
// we are forcing UTR version 1.42.0 for Android platform.
62+
job.WithEnvironmentVariable("UTR_VERSION", "1.42.0");
6063
return "utr.bat";
6164
case SystemType.IOS:
6265
job.WithCommands(UtrCommand.Download(systemType, "utr"));
@@ -68,4 +71,4 @@ protected string PrepareUtrExecutable(IJobBuilder job, SystemType systemType)
6871

6972
return "UnifiedTestRunner";
7073
}
71-
}
74+
}

0 commit comments

Comments
 (0)