CHANGE: Use UTR 1.42.0 for iOS jobs

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

@@ -61,7 +61,10 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_ios:
     flavor: m1.mac
     model: SE
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -70,6 +73,8 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobileFunctionalTests - 2022.3 - TvOS
 inputsystem-mobilefunctionaltests_-_2022_3_-_tvos:
@@ -150,7 +155,10 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_ios:
     flavor: m1.mac
     model: SE
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -159,6 +167,8 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobileFunctionalTests - 6000.0 - TvOS
 inputsystem-mobilefunctionaltests_-_6000_0_-_tvos:
@@ -239,7 +249,10 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_ios:
     flavor: m1.mac
     model: SE
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -248,6 +261,8 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobileFunctionalTests - 6000.2 - TvOS
 inputsystem-mobilefunctionaltests_-_6000_2_-_tvos:
@@ -328,7 +343,10 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_ios:
     flavor: m1.mac
     model: SE-Gen3
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -337,6 +355,8 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobileFunctionalTests - 6000.3 - TvOS
 inputsystem-mobilefunctionaltests_-_6000_3_-_tvos:
@@ -417,7 +437,10 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_ios:
     flavor: m1.mac
     model: SE-Gen3
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -426,6 +449,8 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_4_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobileFunctionalTests - 6000.4 - TvOS
 inputsystem-mobilefunctionaltests_-_6000_4_-_tvos:
@@ -506,7 +531,10 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_ios:
     flavor: m1.mac
     model: SE-Gen3
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -515,6 +543,8 @@ inputsystem-mobilefunctionaltests_-_6000_5_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-functional-build-jobs.yml#inputsystem-mobilefunctionalbuildjobs_-_6000_5_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobileFunctionalTests - 6000.5 - TvOS
 inputsystem-mobilefunctionaltests_-_6000_5_-_tvos:

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

@@ -61,7 +61,10 @@ inputsystem-mobileperformancetests_-_2022_3_-_ios:
     flavor: m1.mac
     model: SE
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -70,6 +73,8 @@ inputsystem-mobileperformancetests_-_2022_3_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_2022_3_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobilePerformanceTests - 2022.3 - TvOS
 inputsystem-mobileperformancetests_-_2022_3_-_tvos:
@@ -150,7 +155,10 @@ inputsystem-mobileperformancetests_-_6000_0_-_ios:
     flavor: m1.mac
     model: SE
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -159,6 +167,8 @@ inputsystem-mobileperformancetests_-_6000_0_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_0_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobilePerformanceTests - 6000.0 - TvOS
 inputsystem-mobileperformancetests_-_6000_0_-_tvos:
@@ -239,7 +249,10 @@ inputsystem-mobileperformancetests_-_6000_2_-_ios:
     flavor: m1.mac
     model: SE
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -248,6 +261,8 @@ inputsystem-mobileperformancetests_-_6000_2_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_2_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobilePerformanceTests - 6000.2 - TvOS
 inputsystem-mobileperformancetests_-_6000_2_-_tvos:
@@ -328,7 +343,10 @@ inputsystem-mobileperformancetests_-_6000_3_-_ios:
     flavor: m1.mac
     model: SE-Gen3
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -337,6 +355,8 @@ inputsystem-mobileperformancetests_-_6000_3_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_3_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobilePerformanceTests - 6000.3 - TvOS
 inputsystem-mobileperformancetests_-_6000_3_-_tvos:
@@ -417,7 +437,10 @@ inputsystem-mobileperformancetests_-_6000_4_-_ios:
     flavor: m1.mac
     model: SE-Gen3
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -426,6 +449,8 @@ inputsystem-mobileperformancetests_-_6000_4_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_4_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobilePerformanceTests - 6000.4 - TvOS
 inputsystem-mobileperformancetests_-_6000_4_-_tvos:
@@ -506,7 +531,10 @@ inputsystem-mobileperformancetests_-_6000_5_-_ios:
     flavor: m1.mac
     model: SE-Gen3
   commands:
-  - command: UnifiedTestRunner --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
+  - command: |-
+      curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
+      chmod u+x utr
+  - command: ./utr --suite=playmode --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=ios
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
@@ -515,6 +543,8 @@ inputsystem-mobileperformancetests_-_6000_5_-_ios:
       - build/test-results/**/*
   dependencies:
   - path: .yamato/input-system-mobile-performance-build-jobs.yml#inputsystem-mobileperformancebuildjobs_-_6000_5_-_ios
+  variables:
+    UTR_VERSION: 1.42.0
 
 # InputSystem-MobilePerformanceTests - 6000.5 - TvOS
 inputsystem-mobileperformancetests_-_6000_5_-_tvos:

Tools/CI/Recipes/MobileBaseRecipe.cs

@@ -19,10 +19,6 @@ public override IEnumerable<IJobBuilder> GetJobs()
             var supportedVersions = package.SupportedEditorVersions;
             foreach (var version in supportedVersions)
             {
-                // Skip tests on 2021.3 as it is longer supported
-                if (version == "2021.3")
-                    continue;
-
                 if (platform.System == SystemType.Android)
                 {
                     builders.AddRange(ProduceJobsForAndroid(package, platform, version));
@@ -53,15 +49,20 @@ IEnumerable<IJobBuilder> ProduceJobsForAndroid(Package package, Platform platfor
 
     protected string PrepareUtrExecutable(IJobBuilder job, SystemType systemType)
     {
-        if (systemType == SystemType.Android)
+        switch (systemType)
         {
-            var executableName = "utr.bat";
-            job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands);
-            var utrDownloadCommand = UtrCommand.Download(systemType, executableName);
-            job.WithCommands(utrDownloadCommand);
-            return executableName;
+            case SystemType.Android:
+                job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands);
+                job.WithCommands(UtrCommand.Download(systemType, "utr.bat"));
+                return "utr.bat";
+            case SystemType.IOS:
+                job.WithCommands(UtrCommand.Download(systemType, "utr"));
+                // A temporary fix for the issue where UTR 1.41.0 cannot handle new signing for 6000.5 on iOS platform.
+                // It can be removed once https://artifactory.prd.it.unity3d.com/ui/native/unity-tools-local/utr-standalone/utr has been bumped to 1.42.0 or above.
+                job.WithEnvironmentVariable("UTR_VERSION", "1.42.0");
+                return "./utr";
+            default:
+                return "UnifiedTestRunner";
         }
-
-        return "UnifiedTestRunner";
     }
 }

Tools/CI/Recipes/MobileFunctionalTests.cs

@@ -26,8 +26,10 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf
             .WithDescription(jobName)
             .WithPlatform(platform)
             .WithCommands(Utilities.GetEditorDownloadCommand(unityBranch, platform));
+
+        var utrExecutable = PrepareUtrExecutable(job, platform.System);
 
-        var utrCommand = UtrCommand.Run(platform.System, b => b
+        var utrCommand = UtrCommand.Run(platform.System, utrExecutable,b => b
                 .WithTestProject($"{ProjectPath}")
                 .WithEditor(".Editor")
                 .WithSuite(UtrTestSuiteType.Playmode)

Tools/CI/Recipes/Triggers.cs

@@ -15,16 +15,16 @@ public class Triggers: RecipeBase
     IEnumerable<Dependency> allEditorFunctionalTests = new EditorFunctionalTests().AsDependencies();
     IEnumerable<Dependency> allStandaloneFunctionalTests = new StandaloneFunctionalTests().AsDependencies();
     IEnumerable<Dependency> allStandaloneIl2CppFunctionalTests = new StandaloneIl2CppFunctionalTests().AsDependencies();
-    // Run functional tests in all Unity versions on all mobile platforms except for TvOS, which only runs in 2021.3.
-    IEnumerable<Dependency> allMobileFunctionalTests = new MobileFunctionalTests().AsDependencies().Where( d => !d.JobId.Contains("TvOS") || d.JobId.Contains("2021.3"));
+    // Run functional tests in all Unity versions on all mobile platforms except TvOS.
+    IEnumerable<Dependency> allMobileFunctionalTests = new MobileFunctionalTests().AsDependencies().Where( d => !d.JobId.Contains("TvOS"));
     // Run functional build jobs on TvOS for all Unity versions.
     IEnumerable<Dependency> allTvOSFunctionalBuildJobs = new MobileFunctionalBuildJobs().AsDependencies().Where(d=> d.JobId.Contains("TvOS"));
 
     IEnumerable<Dependency> allEditorPerformanceTests = new EditorPerformanceTests().AsDependencies();
     IEnumerable<Dependency> allStandalonePerformanceTests = new StandalonePerformanceTests().AsDependencies();
     IEnumerable<Dependency> allStandaloneIl2CppPerformanceTests = new StandaloneIl2CppPerformanceTests().AsDependencies();
-    // Run performance tests in all Unity versions on all mobile platforms except for TvOS, which only runs in 2021.3.
-    IEnumerable<Dependency> allMobilePerformanceTests = new MobilePerformanceTests().AsDependencies().Where( d => !d.JobId.Contains("TvOS") || d.JobId.Contains("2021.3"));
+    // Run performance tests in all Unity versions on all mobile platforms except TvOS.
+    IEnumerable<Dependency> allMobilePerformanceTests = new MobilePerformanceTests().AsDependencies().Where( d => !d.JobId.Contains("TvOS"));
     // Run performance build jobs on TvOS for all Unity versions.
     IEnumerable<Dependency> allTvOSPerformanceBuildJobs = new MobilePerformanceBuildJobs().AsDependencies().Where(d=> d.JobId.Contains("TvOS"));