diff --git a/.yamato/input-system-mobile-functional-tests.yml b/.yamato/input-system-mobile-functional-tests.yml index b19ef99730..7b8e5d6494 100644 --- a/.yamato/input-system-mobile-functional-tests.yml +++ b/.yamato/input-system-mobile-functional-tests.yml @@ -4,15 +4,16 @@ 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: - 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 @@ -29,15 +30,16 @@ 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: - 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 @@ -91,15 +93,16 @@ 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: - 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 @@ -116,15 +119,16 @@ 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: - 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 @@ -178,15 +182,16 @@ 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: - 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 @@ -203,15 +208,16 @@ 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: - 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 @@ -265,15 +271,16 @@ 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: - 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 @@ -290,15 +297,16 @@ 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: - 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 @@ -352,15 +360,16 @@ 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: - 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 @@ -377,15 +386,16 @@ 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: - 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 6a7bdb6ab7..49915e0fad 100644 --- a/.yamato/input-system-mobile-performance-tests.yml +++ b/.yamato/input-system-mobile-performance-tests.yml @@ -4,15 +4,16 @@ 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: - 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 --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 @@ -29,15 +30,16 @@ 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: - 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 --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 @@ -91,15 +93,16 @@ 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: - 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 --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 @@ -116,15 +119,16 @@ 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: - 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 --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 @@ -178,15 +182,16 @@ 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: - 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 --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 @@ -203,15 +208,16 @@ 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: - 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 --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 @@ -265,15 +271,16 @@ 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: - 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 --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 @@ -290,15 +297,16 @@ 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: - 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 --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 @@ -352,15 +360,16 @@ 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: - 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 --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 @@ -377,15 +386,16 @@ 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: - 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 --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/.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" } } 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 f3f2b01e49..bb2d207056 100644 --- a/Tools/CI/Recipes/MobileFunctionalTests.cs +++ b/Tools/CI/Recipes/MobileFunctionalTests.cs @@ -86,11 +86,9 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf platform = Settings.iOS15Platform; IJobBuilder job = JobBuilder.Create(jobName).WithDescription(jobName).WithPlatform(platform); - - if (platform.System == SystemType.Android) - job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); + var utrExecutable = PrepareUtrExecutable(job, platform.System); - 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 1caa301353..ddc5e340de 100644 --- a/Tools/CI/Recipes/MobilePerformanceTests.cs +++ b/Tools/CI/Recipes/MobilePerformanceTests.cs @@ -87,11 +87,9 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf platform = Settings.iOS15Platform; IJobBuilder job = JobBuilder.Create(jobName).WithDescription(jobName).WithPlatform(platform); + var utrExecutable = PrepareUtrExecutable(job, platform.System); - if (platform.System == SystemType.Android) - job.WithCommands(Settings.AndroidExtraCommands).WithAfterCommands(Settings.AndroidExtraAfterCommands); - - var utrCommand = UtrCommand.Run(platform.System, b => b + var utrCommand = UtrCommand.Run(platform.System, utrExecutable, b => b .WithSuite(UtrTestSuiteType.Playmode) .WithCategory("Performance") .WithRerun(1) @@ -106,6 +104,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