From 2350217a988f8b723e2cc9e66aa41076254e1f3b Mon Sep 17 00:00:00 2001 From: "lukas.michnevic" Date: Fri, 17 Oct 2025 14:47:25 +0300 Subject: [PATCH 1/4] try using android execution image --- .../input-system-mobile-functional-tests.yml | 20 +++++++++---------- .../input-system-mobile-performance-tests.yml | 20 +++++++++---------- .yamato/mobile_config.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.yamato/input-system-mobile-functional-tests.yml b/.yamato/input-system-mobile-functional-tests.yml index b19ef99730..5d38419075 100644 --- a/.yamato/input-system-mobile-functional-tests.yml +++ b/.yamato/input-system-mobile-functional-tests.yml @@ -4,7 +4,7 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_il2cpp: name: InputSystem-MobileFunctionalTests - 2022.3 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -29,7 +29,7 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_il2cpp: inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono: name: InputSystem-MobileFunctionalTests - 2022.3 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -91,7 +91,7 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_tvos: inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp: name: InputSystem-MobileFunctionalTests - 6000.0 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -116,7 +116,7 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp: inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono: name: InputSystem-MobileFunctionalTests - 6000.0 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -178,7 +178,7 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_tvos: inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp: name: InputSystem-MobileFunctionalTests - 6000.2 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -203,7 +203,7 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp: inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono: name: InputSystem-MobileFunctionalTests - 6000.2 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -265,7 +265,7 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_tvos: inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp: name: InputSystem-MobileFunctionalTests - 6000.3 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -290,7 +290,7 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp: inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono: name: InputSystem-MobileFunctionalTests - 6000.3 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -352,7 +352,7 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_tvos: inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_il2cpp: name: InputSystem-MobileFunctionalTests - 6000.4 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -377,7 +377,7 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_il2cpp: inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono: name: InputSystem-MobileFunctionalTests - 6000.4 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: diff --git a/.yamato/input-system-mobile-performance-tests.yml b/.yamato/input-system-mobile-performance-tests.yml index 6a7bdb6ab7..1a796bc957 100644 --- a/.yamato/input-system-mobile-performance-tests.yml +++ b/.yamato/input-system-mobile-performance-tests.yml @@ -4,7 +4,7 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_il2cpp: name: InputSystem-MobilePerformanceTests - 2022.3 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -29,7 +29,7 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_il2cpp: inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono: name: InputSystem-MobilePerformanceTests - 2022.3 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -91,7 +91,7 @@ inputsystem-mobileperformancetests_-_2022_3_-_tvos: inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp: name: InputSystem-MobilePerformanceTests - 6000.0 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -116,7 +116,7 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp: inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono: name: InputSystem-MobilePerformanceTests - 6000.0 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -178,7 +178,7 @@ inputsystem-mobileperformancetests_-_6000_0_-_tvos: inputsystem-mobileperformancetests_-_6000_2_-_android_-_il2cpp: name: InputSystem-MobilePerformanceTests - 6000.2 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -203,7 +203,7 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_il2cpp: inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono: name: InputSystem-MobilePerformanceTests - 6000.2 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -265,7 +265,7 @@ inputsystem-mobileperformancetests_-_6000_2_-_tvos: inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp: name: InputSystem-MobilePerformanceTests - 6000.3 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -290,7 +290,7 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp: inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono: name: InputSystem-MobilePerformanceTests - 6000.3 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -352,7 +352,7 @@ inputsystem-mobileperformancetests_-_6000_3_-_tvos: inputsystem-mobileperformancetests_-_6000_4_-_android_-_il2cpp: name: InputSystem-MobilePerformanceTests - 6000.4 - Android - il2cpp agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: @@ -377,7 +377,7 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_il2cpp: inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono: name: InputSystem-MobilePerformanceTests - 6000.4 - Android - mono agent: - image: package-ci/win10:default + image: mobile/android-execution-base:v2.3785910 type: Unity::mobile::shield flavor: b1.xlarge commands: diff --git a/.yamato/mobile_config.json b/.yamato/mobile_config.json index fa268966ff..b71a006268 100644 --- a/.yamato/mobile_config.json +++ b/.yamato/mobile_config.json @@ -32,7 +32,7 @@ }, "run": { "type": "Unity::mobile::shield", - "image": "package-ci/win10:default", + "image": "mobile/android-execution-base:v2.3785910", "flavor": "b1.xlarge" } } From 7aae374d2de66a158adcd8a60f0f4768b1633933 Mon Sep 17 00:00:00 2001 From: "lukas.michnevic" Date: Fri, 17 Oct 2025 19:16:13 +0300 Subject: [PATCH 2/4] add utr download command --- .yamato/input-system-mobile-performance-tests.yml | 10 ++++++++++ Tools/CI/Recipes/MobilePerformanceTests.cs | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/.yamato/input-system-mobile-performance-tests.yml b/.yamato/input-system-mobile-performance-tests.yml index 1a796bc957..eb141958b9 100644 --- a/.yamato/input-system-mobile-performance-tests.yml +++ b/.yamato/input-system-mobile-performance-tests.yml @@ -10,6 +10,7 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android @@ -35,6 +36,7 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android @@ -97,6 +99,7 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android @@ -122,6 +125,7 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android @@ -184,6 +188,7 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android @@ -209,6 +214,7 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android @@ -271,6 +277,7 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android @@ -296,6 +303,7 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android @@ -358,6 +366,7 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android @@ -383,6 +392,7 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% UnifiedTestRunner.exe --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=android diff --git a/Tools/CI/Recipes/MobilePerformanceTests.cs b/Tools/CI/Recipes/MobilePerformanceTests.cs index 1caa301353..c56106d720 100644 --- a/Tools/CI/Recipes/MobilePerformanceTests.cs +++ b/Tools/CI/Recipes/MobilePerformanceTests.cs @@ -91,6 +91,12 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf if (platform.System == SystemType.Android) job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); + if (platform.System == SystemType.Android || platform.System == SystemType.AndroidMacOS) + { + var utrDownloadCommand = UtrCommand.Download(platform.System); + job.WithCommands(utrDownloadCommand); + } + var utrCommand = UtrCommand.Run(platform.System, b => b .WithSuite(UtrTestSuiteType.Playmode) .WithCategory("Performance") @@ -106,6 +112,7 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf .WithDependencies(buildJob) .WithArtifact(new Artifact("logs", "build/test-results/**/*")) .WithInfrastructureInstabilityDetection(); + return job; } } \ No newline at end of file From fbb9f61af5b25c01f8848e2f48323599d7126d5f Mon Sep 17 00:00:00 2001 From: "lukas.michnevic" Date: Mon, 20 Oct 2025 11:24:07 +0300 Subject: [PATCH 3/4] override default utr names --- .../input-system-mobile-functional-tests.yml | 30 +++++++++----- .../input-system-mobile-performance-tests.yml | 40 +++++++++---------- Tools/CI/Recipes/MobileFunctionalTests.cs | 9 ++++- Tools/CI/Recipes/MobilePerformanceTests.cs | 10 ++--- 4 files changed, 53 insertions(+), 36 deletions(-) diff --git a/.yamato/input-system-mobile-functional-tests.yml b/.yamato/input-system-mobile-functional-tests.yml index 5d38419075..7b8e5d6494 100644 --- a/.yamato/input-system-mobile-functional-tests.yml +++ b/.yamato/input-system-mobile-functional-tests.yml @@ -10,9 +10,10 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -35,9 +36,10 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -97,9 +99,10 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -122,9 +125,10 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -184,9 +188,10 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -209,9 +214,10 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -271,9 +277,10 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -296,9 +303,10 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -358,9 +366,10 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -383,9 +392,10 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android + utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results diff --git a/.yamato/input-system-mobile-performance-tests.yml b/.yamato/input-system-mobile-performance-tests.yml index eb141958b9..49915e0fad 100644 --- a/.yamato/input-system-mobile-performance-tests.yml +++ b/.yamato/input-system-mobile-performance-tests.yml @@ -10,10 +10,10 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -36,10 +36,10 @@ inputsystem-mobileperformancetests_-_2022_3_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -99,10 +99,10 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -125,10 +125,10 @@ inputsystem-mobileperformancetests_-_6000_0_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -188,10 +188,10 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -214,10 +214,10 @@ inputsystem-mobileperformancetests_-_6000_2_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -277,10 +277,10 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -303,10 +303,10 @@ inputsystem-mobileperformancetests_-_6000_3_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -366,10 +366,10 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_il2cpp: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results @@ -392,10 +392,10 @@ inputsystem-mobileperformancetests_-_6000_4_-_android_-_mono: commands: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices - - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output UnifiedTestRunner.exe + - command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat - command: |- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - UnifiedTestRunner.exe --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=android + utr.bat --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=android after: - command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP% - command: if not exist build\test-results mkdir build\test-results diff --git a/Tools/CI/Recipes/MobileFunctionalTests.cs b/Tools/CI/Recipes/MobileFunctionalTests.cs index f3f2b01e49..9c86dbf7bf 100644 --- a/Tools/CI/Recipes/MobileFunctionalTests.cs +++ b/Tools/CI/Recipes/MobileFunctionalTests.cs @@ -87,10 +87,17 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf IJobBuilder job = JobBuilder.Create(jobName).WithDescription(jobName).WithPlatform(platform); + var utrExecutable = "UnifiedTestRunner"; + if (platform.System == SystemType.Android) + { job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); + utrExecutable = "utr.bat"; + var utrDownloadCommand = UtrCommand.Download(platform.System, "utr.bat"); + job.WithCommands(utrDownloadCommand); + } - var utrCommand = UtrCommand.Run(platform.System, b => b + var utrCommand = UtrCommand.Run(platform.System, utrExecutable, b => b .WithSuite(UtrTestSuiteType.Playmode) .WithCategory("!Performance") .WithRerun(1) diff --git a/Tools/CI/Recipes/MobilePerformanceTests.cs b/Tools/CI/Recipes/MobilePerformanceTests.cs index c56106d720..30b7e1f510 100644 --- a/Tools/CI/Recipes/MobilePerformanceTests.cs +++ b/Tools/CI/Recipes/MobilePerformanceTests.cs @@ -87,17 +87,17 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf platform = Settings.iOS15Platform; IJobBuilder job = JobBuilder.Create(jobName).WithDescription(jobName).WithPlatform(platform); + var utrExecutable = "UnifiedTestRunner"; if (platform.System == SystemType.Android) - job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); - - if (platform.System == SystemType.Android || platform.System == SystemType.AndroidMacOS) { - var utrDownloadCommand = UtrCommand.Download(platform.System); + job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); + utrExecutable = "utr.bat"; + var utrDownloadCommand = UtrCommand.Download(platform.System, "utr.bat"); job.WithCommands(utrDownloadCommand); } - var utrCommand = UtrCommand.Run(platform.System, b => b + var utrCommand = UtrCommand.Run(platform.System, utrExecutable, b => b .WithSuite(UtrTestSuiteType.Playmode) .WithCategory("Performance") .WithRerun(1) From ab9ffdda7e481cb7b9ff754be5620c1459757065 Mon Sep 17 00:00:00 2001 From: "lukas.michnevic" Date: Mon, 20 Oct 2025 13:44:27 +0300 Subject: [PATCH 4/4] make utr executable builder more universal --- Tools/CI/Recipes/MobileBaseRecipe.cs | 17 ++++++++++++++++- Tools/CI/Recipes/MobileFunctionalTests.cs | 11 +---------- Tools/CI/Recipes/MobilePerformanceTests.cs | 10 +--------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Tools/CI/Recipes/MobileBaseRecipe.cs b/Tools/CI/Recipes/MobileBaseRecipe.cs index a07cd897d7..2be0d990cb 100644 --- a/Tools/CI/Recipes/MobileBaseRecipe.cs +++ b/Tools/CI/Recipes/MobileBaseRecipe.cs @@ -1,5 +1,6 @@ using RecipeEngine.Api.Jobs; using RecipeEngine.Api.Platforms; +using RecipeEngine.Modules.UnifiedTestRunner; using RecipeEngine.Platforms; using RecipeEngine.Unity.Abstractions.Packages; @@ -35,7 +36,7 @@ public override IEnumerable GetJobs() return builders; } - + // Produces jobs for Android platform with different scripting backends. IEnumerable ProduceJobsForAndroid(Package package, Platform platform, string unityVersion) { @@ -49,4 +50,18 @@ IEnumerable ProduceJobsForAndroid(Package package, Platform platfor return builders; } + + protected string PrepareUtrExecutable(IJobBuilder job, SystemType systemType) + { + if (systemType == SystemType.Android) + { + var executableName = "utr.bat"; + job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); + var utrDownloadCommand = UtrCommand.Download(systemType, executableName); + job.WithCommands(utrDownloadCommand); + return executableName; + } + + return "UnifiedTestRunner"; + } } \ No newline at end of file diff --git a/Tools/CI/Recipes/MobileFunctionalTests.cs b/Tools/CI/Recipes/MobileFunctionalTests.cs index 9c86dbf7bf..bb2d207056 100644 --- a/Tools/CI/Recipes/MobileFunctionalTests.cs +++ b/Tools/CI/Recipes/MobileFunctionalTests.cs @@ -86,16 +86,7 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf platform = Settings.iOS15Platform; IJobBuilder job = JobBuilder.Create(jobName).WithDescription(jobName).WithPlatform(platform); - - var utrExecutable = "UnifiedTestRunner"; - - if (platform.System == SystemType.Android) - { - job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); - utrExecutable = "utr.bat"; - var utrDownloadCommand = UtrCommand.Download(platform.System, "utr.bat"); - job.WithCommands(utrDownloadCommand); - } + var utrExecutable = PrepareUtrExecutable(job, platform.System); var utrCommand = UtrCommand.Run(platform.System, utrExecutable, b => b .WithSuite(UtrTestSuiteType.Playmode) diff --git a/Tools/CI/Recipes/MobilePerformanceTests.cs b/Tools/CI/Recipes/MobilePerformanceTests.cs index 30b7e1f510..ddc5e340de 100644 --- a/Tools/CI/Recipes/MobilePerformanceTests.cs +++ b/Tools/CI/Recipes/MobilePerformanceTests.cs @@ -87,15 +87,7 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf platform = Settings.iOS15Platform; IJobBuilder job = JobBuilder.Create(jobName).WithDescription(jobName).WithPlatform(platform); - var utrExecutable = "UnifiedTestRunner"; - - if (platform.System == SystemType.Android) - { - job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); - utrExecutable = "utr.bat"; - var utrDownloadCommand = UtrCommand.Download(platform.System, "utr.bat"); - job.WithCommands(utrDownloadCommand); - } + var utrExecutable = PrepareUtrExecutable(job, platform.System); var utrCommand = UtrCommand.Run(platform.System, utrExecutable, b => b .WithSuite(UtrTestSuiteType.Playmode)