From 69751ba08fe3bc5d15679421fd118284d97489e9 Mon Sep 17 00:00:00 2001 From: tomzig16 Date: Wed, 3 Jun 2020 14:35:44 +0300 Subject: [PATCH 1/2] Update android job generating script --- .yamato/ruamel/jobs/projects/commands/android.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/ruamel/jobs/projects/commands/android.py b/.yamato/ruamel/jobs/projects/commands/android.py index deec4806c84..e99d765f7ca 100644 --- a/.yamato/ruamel/jobs/projects/commands/android.py +++ b/.yamato/ruamel/jobs/projects/commands/android.py @@ -20,7 +20,7 @@ def cmd_standalone(project_folder, platform, api, test_platform_args): f'NetSh Advfirewall set allprofiles state off', pss(f''' set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path={PATH_TEST_RESULTS} --player-load-path={PATH_PLAYERS} --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP%'''), + utr\\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path={PATH_TEST_RESULTS} --player-load-path={PATH_PLAYERS} --scripting-backend=il2cpp --timeout=1200'''), f'start %ANDROID_SDK_ROOT%\platform-tools\\adb.exe kill-server' ]) return base From ba6d1a3ca5f4a1596f45e870c9306054dae59e5c Mon Sep 17 00:00:00 2001 From: tomzig16 Date: Wed, 3 Jun 2020 14:36:30 +0300 Subject: [PATCH 2/2] Update existing jobs after running updated android.py --- .yamato/universal_hybrid-android-opengles3.yml | 6 +++--- .yamato/universal_hybrid-android-vulkan.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.yamato/universal_hybrid-android-opengles3.yml b/.yamato/universal_hybrid-android-opengles3.yml index a69e69b76f9..8796a8c067b 100644 --- a/.yamato/universal_hybrid-android-opengles3.yml +++ b/.yamato/universal_hybrid-android-opengles3.yml @@ -21,7 +21,7 @@ Universal_Hybrid_Android_OpenGLES3_Standalone_trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -77,7 +77,7 @@ Universal_Hybrid_Android_OpenGLES3_Standalone_fast-trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -134,7 +134,7 @@ Universal_Hybrid_Android_OpenGLES3_Standalone_CUSTOM-REVISION: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: diff --git a/.yamato/universal_hybrid-android-vulkan.yml b/.yamato/universal_hybrid-android-vulkan.yml index 1b402f37f76..65a906a3f05 100644 --- a/.yamato/universal_hybrid-android-vulkan.yml +++ b/.yamato/universal_hybrid-android-vulkan.yml @@ -21,7 +21,7 @@ Universal_Hybrid_Android_Vulkan_Standalone_trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -77,7 +77,7 @@ Universal_Hybrid_Android_Vulkan_Standalone_fast-trunk: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: @@ -134,7 +134,7 @@ Universal_Hybrid_Android_Vulkan_Standalone_CUSTOM-REVISION: - |5- set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% - utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 --player-connection-ip=%BOKKEN_DEVICE_IP% + utr\utr --suite=playmode --platform=Android --editor-location=WindowsEditor --artifacts_path=test-results --player-load-path=players --scripting-backend=il2cpp --timeout=1200 - start %ANDROID_SDK_ROOT%\platform-tools\adb.exe kill-server artifacts: logs: