Skip to content

Commit b5a5349

Browse files
KernalPanikKernalPanik
authored
FIX: Use android-execution image for Test runs (#2260)
1 parent 2c4a437 commit b5a5349

File tree

6 files changed

+82
-50
lines changed

6 files changed

+82
-50
lines changed

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

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_il2cpp:
55
name: InputSystem-MobileFunctionalTests - 2022.3 - Android - il2cpp
66
agent:
7-
image: package-ci/win10:default
7+
image: mobile/android-execution-base:v2.3785910
88
type: Unity::mobile::shield
99
flavor: b1.xlarge
1010
commands:
1111
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
1212
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
13+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
1314
- command: |-
1415
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
15-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
16+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
1617
after:
1718
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
1819
- command: if not exist build\test-results mkdir build\test-results
@@ -29,15 +30,16 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_il2cpp:
2930
inputsystem-mobilefunctionaltests_-_2022_3_-_android_-_mono:
3031
name: InputSystem-MobileFunctionalTests - 2022.3 - Android - mono
3132
agent:
32-
image: package-ci/win10:default
33+
image: mobile/android-execution-base:v2.3785910
3334
type: Unity::mobile::shield
3435
flavor: b1.xlarge
3536
commands:
3637
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
3738
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
39+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
3840
- command: |-
3941
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
40-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
42+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
4143
after:
4244
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
4345
- command: if not exist build\test-results mkdir build\test-results
@@ -91,15 +93,16 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_tvos:
9193
inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp:
9294
name: InputSystem-MobileFunctionalTests - 6000.0 - Android - il2cpp
9395
agent:
94-
image: package-ci/win10:default
96+
image: mobile/android-execution-base:v2.3785910
9597
type: Unity::mobile::shield
9698
flavor: b1.xlarge
9799
commands:
98100
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
99101
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
102+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
100103
- command: |-
101104
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
102-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
105+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
103106
after:
104107
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
105108
- command: if not exist build\test-results mkdir build\test-results
@@ -116,15 +119,16 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_il2cpp:
116119
inputsystem-mobilefunctionaltests_-_6000_0_-_android_-_mono:
117120
name: InputSystem-MobileFunctionalTests - 6000.0 - Android - mono
118121
agent:
119-
image: package-ci/win10:default
122+
image: mobile/android-execution-base:v2.3785910
120123
type: Unity::mobile::shield
121124
flavor: b1.xlarge
122125
commands:
123126
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
124127
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
128+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
125129
- command: |-
126130
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
127-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
131+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
128132
after:
129133
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
130134
- command: if not exist build\test-results mkdir build\test-results
@@ -178,15 +182,16 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_tvos:
178182
inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp:
179183
name: InputSystem-MobileFunctionalTests - 6000.2 - Android - il2cpp
180184
agent:
181-
image: package-ci/win10:default
185+
image: mobile/android-execution-base:v2.3785910
182186
type: Unity::mobile::shield
183187
flavor: b1.xlarge
184188
commands:
185189
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
186190
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
191+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
187192
- command: |-
188193
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
189-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
194+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
190195
after:
191196
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
192197
- command: if not exist build\test-results mkdir build\test-results
@@ -203,15 +208,16 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_il2cpp:
203208
inputsystem-mobilefunctionaltests_-_6000_2_-_android_-_mono:
204209
name: InputSystem-MobileFunctionalTests - 6000.2 - Android - mono
205210
agent:
206-
image: package-ci/win10:default
211+
image: mobile/android-execution-base:v2.3785910
207212
type: Unity::mobile::shield
208213
flavor: b1.xlarge
209214
commands:
210215
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
211216
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
217+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
212218
- command: |-
213219
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
214-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
220+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
215221
after:
216222
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
217223
- command: if not exist build\test-results mkdir build\test-results
@@ -265,15 +271,16 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_tvos:
265271
inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp:
266272
name: InputSystem-MobileFunctionalTests - 6000.3 - Android - il2cpp
267273
agent:
268-
image: package-ci/win10:default
274+
image: mobile/android-execution-base:v2.3785910
269275
type: Unity::mobile::shield
270276
flavor: b1.xlarge
271277
commands:
272278
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
273279
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
280+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
274281
- command: |-
275282
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
276-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
283+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
277284
after:
278285
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
279286
- command: if not exist build\test-results mkdir build\test-results
@@ -290,15 +297,16 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_il2cpp:
290297
inputsystem-mobilefunctionaltests_-_6000_3_-_android_-_mono:
291298
name: InputSystem-MobileFunctionalTests - 6000.3 - Android - mono
292299
agent:
293-
image: package-ci/win10:default
300+
image: mobile/android-execution-base:v2.3785910
294301
type: Unity::mobile::shield
295302
flavor: b1.xlarge
296303
commands:
297304
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
298305
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
306+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
299307
- command: |-
300308
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
301-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
309+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
302310
after:
303311
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
304312
- command: if not exist build\test-results mkdir build\test-results
@@ -352,15 +360,16 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_tvos:
352360
inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_il2cpp:
353361
name: InputSystem-MobileFunctionalTests - 6000.4 - Android - il2cpp
354362
agent:
355-
image: package-ci/win10:default
363+
image: mobile/android-execution-base:v2.3785910
356364
type: Unity::mobile::shield
357365
flavor: b1.xlarge
358366
commands:
359367
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
360368
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
369+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
361370
- command: |-
362371
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
363-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
372+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
364373
after:
365374
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
366375
- command: if not exist build\test-results mkdir build\test-results
@@ -377,15 +386,16 @@ inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_il2cpp:
377386
inputsystem-mobilefunctionaltests_-_6000_4_-_android_-_mono:
378387
name: InputSystem-MobileFunctionalTests - 6000.4 - Android - mono
379388
agent:
380-
image: package-ci/win10:default
389+
image: mobile/android-execution-base:v2.3785910
381390
type: Unity::mobile::shield
382391
flavor: b1.xlarge
383392
commands:
384393
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
385394
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
395+
- command: curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
386396
- command: |-
387397
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
388-
UnifiedTestRunner.exe --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
398+
utr.bat --suite=playmode --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --timeout=3600 --artifacts-path=build/test-results --platform=android
389399
after:
390400
- command: start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
391401
- command: if not exist build\test-results mkdir build\test-results

0 commit comments

Comments
 (0)