diff --git a/.yamato/all-urp_performance_boatattack.yml b/.yamato/all-urp_performance_boatattack.yml index fcdcb9b30ef..7e7cd57efdd 100644 --- a/.yamato/all-urp_performance_boatattack.yml +++ b/.yamato/all-urp_performance_boatattack.yml @@ -14,19 +14,19 @@ All_URP_Performance_BoatAttack_trunk: rerun: on-new-revision - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_playmode_editor_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_editmode_build_mono_Linear_trunk + - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_build_editmode_mono_Linear_trunk rerun: on-new-revision - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_playmode_runtime_il2cpp_Linear_trunk rerun: on-new-revision - - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_editmode_build_il2cpp_Linear_trunk + - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_trunk rerun: on-new-revision - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_playmode_runtime_il2cpp_Linear_trunk rerun: on-new-revision - - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_editmode_build_il2cpp_Linear_trunk + - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_build_editmode_il2cpp_Linear_trunk rerun: on-new-revision - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_playmode_runtime_il2cpp_Linear_trunk rerun: on-new-revision - - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_editmode_build_il2cpp_Linear_trunk + - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_build_editmode_il2cpp_Linear_trunk rerun: on-new-revision variables: BOAT_ATTACK_BRANCH: master @@ -38,19 +38,19 @@ All_URP_Performance_BoatAttack_CUSTOM-REVISION: rerun: always - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_playmode_editor_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_editmode_build_mono_Linear_CUSTOM-REVISION + - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_build_editmode_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_playmode_runtime_il2cpp_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_editmode_build_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/urp_performance_boatattack-android-opengles3.yml#URP_Performance_BoatAttack_Android_OpenGLES3_performance_build_editmode_il2cpp_Linear_CUSTOM-REVISION rerun: always - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_playmode_runtime_il2cpp_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_editmode_build_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/urp_performance_boatattack-android-vulkan.yml#URP_Performance_BoatAttack_Android_Vulkan_performance_build_editmode_il2cpp_Linear_CUSTOM-REVISION rerun: always - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_playmode_runtime_il2cpp_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_editmode_build_il2cpp_Linear_CUSTOM-REVISION + - path: .yamato/urp_performance_boatattack-iphone-metal.yml#URP_Performance_BoatAttack_iPhone_Metal_performance_build_editmode_il2cpp_Linear_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/config/universal_perf_boatattack.metafile b/.yamato/config/universal_perf_boatattack.metafile index b1f23efde08..5eea44c2337 100644 --- a/.yamato/config/universal_perf_boatattack.metafile +++ b/.yamato/config/universal_perf_boatattack.metafile @@ -36,7 +36,7 @@ test_platforms: - [all]: --extra-editor-arg="-packageundertestrevdate=%GIT_REVISIONDATE%" - [all]: --extra-editor-arg="-packageundertestbranch=%GIT_BRANCH%" - type: editmode - name: performance_editmode_build + name: performance_build_editmode is_performance: True utr_flags: - [all]: --testfilter=Build @@ -59,6 +59,19 @@ platforms: - name: mono color_spaces: - Linear + agents_project: + default: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.large + standalone_build: + type: Unity::VM + image: sdet/gamecode_win10:stable + flavor: b1.xlarge + performance_build_editmode: + type: Unity::VM + image: sdet/gamecode_win10:stable + flavor: b1.large - name: Android apis: - name: Vulkan @@ -71,6 +84,19 @@ platforms: - name: il2cpp color_spaces: - Linear + agents_project: + default: + type: Unity::mobile::android + image: mobile/android-execution-r19:stable + flavor: b1.large + standalone_build: + type: Unity::VM + image: mobile/android-execution-r19:stable + flavor: b1.large + performance_build_editmode: + type: Unity::VM + image: mobile/android-execution-r19:stable + flavor: b1.large - name: iPhone apis: - name: Metal @@ -90,7 +116,7 @@ platforms: type: Unity::VM::osx image: mobile/macos-10.13-testing:stable flavor: b1.large - performance_editmode_build: + performance_build_editmode: type: Unity::VM::osx image: mobile/macos-10.13-testing:stable flavor: b1.large @@ -103,25 +129,25 @@ all: test_platforms: - performance_playmode_runtime - performance_playmode_editor - - performance_editmode_build + - performance_build_editmode - platform: Android api: OpenGLES3 build_config: il2cpp color_space: Linear test_platforms: - performance_playmode_runtime - - performance_editmode_build + - performance_build_editmode - platform: Android api: Vulkan build_config: il2cpp color_space: Linear test_platforms: - performance_playmode_runtime - - performance_editmode_build + - performance_build_editmode - platform: iPhone api: Metal build_config: il2cpp color_space: Linear test_platforms: - performance_playmode_runtime - - performance_editmode_build \ No newline at end of file + - performance_build_editmode \ No newline at end of file diff --git a/.yamato/hdrp-linux-vulkan.yml b/.yamato/hdrp-linux-vulkan.yml index 16604fcd632..d8dbb08a1a8 100644 --- a/.yamato/hdrp-linux-vulkan.yml +++ b/.yamato/hdrp-linux-vulkan.yml @@ -88,7 +88,7 @@ HDRP_Linux_Vulkan_Standalone_mono_Linear_trunk: - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_trunk rerun: on-new-revision Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Build HDRP on Linux_Vulkan_mono_Linear_Player on version trunk + name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM image: cds-ops/ubuntu-18.04-base:stable @@ -206,7 +206,7 @@ HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - path: .yamato/hdrp-linux-vulkan.yml#Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION rerun: always Build_HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP on Linux_Vulkan_mono_Linear_Player on version CUSTOM-REVISION + name: Build HDRP on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM image: cds-ops/ubuntu-18.04-base:stable diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index e8be513b33b..b87014eb014 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -127,7 +127,7 @@ HDRP_Win_DX11_Standalone_mono_Linear_trunk: - path: .yamato/hdrp-win-dx11.yml#Build_HDRP_Win_DX11_Standalone_mono_Linear_trunk rerun: on-new-revision Build_HDRP_Win_DX11_Standalone_mono_Linear_trunk: - name: Build HDRP on Win_DX11_mono_Linear_Player on version trunk + name: Build HDRP on Win_DX11_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM image: graphics-foundation/win10-dxr:stable @@ -292,7 +292,7 @@ HDRP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION: - path: .yamato/hdrp-win-dx11.yml#Build_HDRP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION rerun: always Build_HDRP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP on Win_DX11_mono_Linear_Player on version CUSTOM-REVISION + name: Build HDRP on Win_DX11_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM image: graphics-foundation/win10-dxr:stable diff --git a/.yamato/hdrp-win-dx12.yml b/.yamato/hdrp-win-dx12.yml index 90dd7328c64..5b320194f7c 100644 --- a/.yamato/hdrp-win-dx12.yml +++ b/.yamato/hdrp-win-dx12.yml @@ -127,7 +127,7 @@ HDRP_Win_DX12_Standalone_mono_Linear_trunk: - path: .yamato/hdrp-win-dx12.yml#Build_HDRP_Win_DX12_Standalone_mono_Linear_trunk rerun: on-new-revision Build_HDRP_Win_DX12_Standalone_mono_Linear_trunk: - name: Build HDRP on Win_DX12_mono_Linear_Player on version trunk + name: Build HDRP on Win_DX12_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM image: graphics-foundation/win10-dxr:stable @@ -292,7 +292,7 @@ HDRP_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION: - path: .yamato/hdrp-win-dx12.yml#Build_HDRP_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION rerun: always Build_HDRP_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP on Win_DX12_mono_Linear_Player on version CUSTOM-REVISION + name: Build HDRP on Win_DX12_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM image: graphics-foundation/win10-dxr:stable diff --git a/.yamato/hdrp-win-vulkan.yml b/.yamato/hdrp-win-vulkan.yml index ea869134c44..4fd56e9c1cc 100644 --- a/.yamato/hdrp-win-vulkan.yml +++ b/.yamato/hdrp-win-vulkan.yml @@ -127,7 +127,7 @@ HDRP_Win_Vulkan_Standalone_mono_Linear_trunk: - path: .yamato/hdrp-win-vulkan.yml#Build_HDRP_Win_Vulkan_Standalone_mono_Linear_trunk rerun: on-new-revision Build_HDRP_Win_Vulkan_Standalone_mono_Linear_trunk: - name: Build HDRP on Win_Vulkan_mono_Linear_Player on version trunk + name: Build HDRP on Win_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM image: graphics-foundation/win10-dxr:stable @@ -292,7 +292,7 @@ HDRP_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - path: .yamato/hdrp-win-vulkan.yml#Build_HDRP_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION rerun: always Build_HDRP_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP on Win_Vulkan_mono_Linear_Player on version CUSTOM-REVISION + name: Build HDRP on Win_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM image: graphics-foundation/win10-dxr:stable diff --git a/.yamato/hdrp_dxr-win-dx12.yml b/.yamato/hdrp_dxr-win-dx12.yml index 3f75e6fb7e6..99b320546fd 100644 --- a/.yamato/hdrp_dxr-win-dx12.yml +++ b/.yamato/hdrp_dxr-win-dx12.yml @@ -28,7 +28,7 @@ HDRP_DXR_Win_DX12_Standalone_mono_Linear_trunk: - path: .yamato/hdrp_dxr-win-dx12.yml#Build_HDRP_DXR_Win_DX12_Standalone_mono_Linear_trunk rerun: on-new-revision Build_HDRP_DXR_Win_DX12_Standalone_mono_Linear_trunk: - name: Build HDRP_DXR on Win_DX12_mono_Linear_Player on version trunk + name: Build HDRP_DXR on Win_DX12_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM::GPU image: graphics-foundation/win10-dxr:stable @@ -154,7 +154,7 @@ HDRP_DXR_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION: - path: .yamato/hdrp_dxr-win-dx12.yml#Build_HDRP_DXR_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION rerun: always Build_HDRP_DXR_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP_DXR on Win_DX12_mono_Linear_Player on version CUSTOM-REVISION + name: Build HDRP_DXR on Win_DX12_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: graphics-foundation/win10-dxr:stable diff --git a/.yamato/hdrp_hybrid-linux-vulkan.yml b/.yamato/hdrp_hybrid-linux-vulkan.yml index be25e5b8ea7..8f22fb34277 100644 --- a/.yamato/hdrp_hybrid-linux-vulkan.yml +++ b/.yamato/hdrp_hybrid-linux-vulkan.yml @@ -48,7 +48,7 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - path: .yamato/hdrp_hybrid-linux-vulkan.yml#Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk rerun: on-new-revision Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Player on version trunk + name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM image: cds-ops/ubuntu-18.04-base:stable @@ -118,7 +118,7 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - path: .yamato/hdrp_hybrid-linux-vulkan.yml#Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION rerun: always Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Player on version CUSTOM-REVISION + name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM image: cds-ops/ubuntu-18.04-base:stable diff --git a/.yamato/hdrp_hybrid-win-dx11.yml b/.yamato/hdrp_hybrid-win-dx11.yml index 524a9ff2dd8..0899caaf5df 100644 --- a/.yamato/hdrp_hybrid-win-dx11.yml +++ b/.yamato/hdrp_hybrid-win-dx11.yml @@ -75,7 +75,7 @@ HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_trunk: - path: .yamato/hdrp_hybrid-win-dx11.yml#Build_HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_trunk rerun: on-new-revision Build_HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_trunk: - name: Build HDRP_Hybrid on Win_DX11_mono_Linear_Player on version trunk + name: Build HDRP_Hybrid on Win_DX11_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM image: sdet/gamecode_win10:stable @@ -180,7 +180,7 @@ HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION: - path: .yamato/hdrp_hybrid-win-dx11.yml#Build_HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION rerun: always Build_HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP_Hybrid on Win_DX11_mono_Linear_Player on version CUSTOM-REVISION + name: Build HDRP_Hybrid on Win_DX11_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM image: sdet/gamecode_win10:stable diff --git a/.yamato/hdrp_hybrid-win-dx12.yml b/.yamato/hdrp_hybrid-win-dx12.yml index fd8e8ae0b03..bb8deea5fd2 100644 --- a/.yamato/hdrp_hybrid-win-dx12.yml +++ b/.yamato/hdrp_hybrid-win-dx12.yml @@ -75,7 +75,7 @@ HDRP_Hybrid_Win_DX12_Standalone_mono_Linear_trunk: - path: .yamato/hdrp_hybrid-win-dx12.yml#Build_HDRP_Hybrid_Win_DX12_Standalone_mono_Linear_trunk rerun: on-new-revision Build_HDRP_Hybrid_Win_DX12_Standalone_mono_Linear_trunk: - name: Build HDRP_Hybrid on Win_DX12_mono_Linear_Player on version trunk + name: Build HDRP_Hybrid on Win_DX12_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM image: sdet/gamecode_win10:stable @@ -180,7 +180,7 @@ HDRP_Hybrid_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION: - path: .yamato/hdrp_hybrid-win-dx12.yml#Build_HDRP_Hybrid_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION rerun: always Build_HDRP_Hybrid_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP_Hybrid on Win_DX12_mono_Linear_Player on version CUSTOM-REVISION + name: Build HDRP_Hybrid on Win_DX12_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM image: sdet/gamecode_win10:stable diff --git a/.yamato/hdrp_hybrid-win-vulkan.yml b/.yamato/hdrp_hybrid-win-vulkan.yml index beddc65205b..adfcc82e98e 100644 --- a/.yamato/hdrp_hybrid-win-vulkan.yml +++ b/.yamato/hdrp_hybrid-win-vulkan.yml @@ -75,7 +75,7 @@ HDRP_Hybrid_Win_Vulkan_Standalone_mono_Linear_trunk: - path: .yamato/hdrp_hybrid-win-vulkan.yml#Build_HDRP_Hybrid_Win_Vulkan_Standalone_mono_Linear_trunk rerun: on-new-revision Build_HDRP_Hybrid_Win_Vulkan_Standalone_mono_Linear_trunk: - name: Build HDRP_Hybrid on Win_Vulkan_mono_Linear_Player on version trunk + name: Build HDRP_Hybrid on Win_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM image: sdet/gamecode_win10:stable @@ -180,7 +180,7 @@ HDRP_Hybrid_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - path: .yamato/hdrp_hybrid-win-vulkan.yml#Build_HDRP_Hybrid_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION rerun: always Build_HDRP_Hybrid_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP_Hybrid on Win_Vulkan_mono_Linear_Player on version CUSTOM-REVISION + name: Build HDRP_Hybrid on Win_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM image: sdet/gamecode_win10:stable diff --git a/.yamato/ruamel/jobs/projects/_project_base.py b/.yamato/ruamel/jobs/projects/_project_base.py index 459b9c539c0..d71213bda9f 100644 --- a/.yamato/ruamel/jobs/projects/_project_base.py +++ b/.yamato/ruamel/jobs/projects/_project_base.py @@ -8,14 +8,17 @@ def _job(project, test_platform_name, editor, platform, api, cmd, build_config, color_space): # define name - if test_platform_name.lower() == 'standalone_build': - job_name = f'Build {project["name"]} on {platform["name"]}_{api["name"]}_{build_config["name"]}_{color_space}_Player on version {editor["name"]}' + if test_platform_name.lower().endswith('_build'): + job_name = f'Build {project["name"]} on {platform["name"]}_{api["name"]}_{build_config["name"]}_{color_space}_{test_platform_name}_Player on version {editor["name"]}' else: job_name = f'{project["name"]} on {platform["name"]}_{api["name"]}_{test_platform_name}_{build_config["name"]}_{color_space} on version {editor["name"]}' # define agent platform_agents_project = platform.get(f'agents_project_{api["name"]}', platform.get('agents_project')) - agent = platform_agents_project.get(f'{test_platform_name.lower()}', platform_agents_project['default']) # replace(" ","_") called for playmode_XR + if test_platform_name.lower().endswith('_build'): + agent = platform_agents_project.get('standalone_build', platform_agents_project['default']) # replace(" ","_") called for playmode_XR + else: + agent = platform_agents_project.get(f'{test_platform_name.lower()}', platform_agents_project['default']) # replace(" ","_") called for playmode_XR # construct job job = YMLJob() @@ -30,7 +33,7 @@ def _job(project, test_platform_name, editor, platform, api, cmd, build_config, job.add_artifacts_project_logs(project.get("folder_standalone", project["folder"])) else: job.add_artifacts_project_logs(project["folder"]) - + if not editor['editor_pinning']: diff --git a/.yamato/ruamel/jobs/projects/commands/android.py b/.yamato/ruamel/jobs/projects/commands/android.py index a7011897c42..3b15c498d23 100644 --- a/.yamato/ruamel/jobs/projects/commands/android.py +++ b/.yamato/ruamel/jobs/projects/commands/android.py @@ -14,17 +14,13 @@ def cmd_editmode(project_folder, platform, api, test_platform, editor, build_con f'curl -s {UTR_INSTALL_URL}.bat --output utr.bat', f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade', f'unity-downloader-cli { get_unity_downloader_cli_cmd(editor, platform["os"]) } -p WindowsEditor {"".join([f"-c {c} " for c in platform["components"]])} --wait --published-only', - f'%ANDROID_SDK_ROOT%\platform-tools\\adb.exe connect %BOKKEN_DEVICE_IP%', - f'powershell %ANDROID_SDK_ROOT%\platform-tools\\adb.exe devices', f'NetSh Advfirewall set allprofiles state off', pss(f''' - set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp set /p GIT_REVISIONDATE= revdate.tmp set /p GIT_REVISIONDATE= revdate.tmp set /p GIT_REVISIONDATE= revdate.tmp set /p GIT_REVISIONDATE= revdate.tmp set /p GIT_REVISIONDATE=