Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions .yamato/config/__shared.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ test_platforms:
after:
- [OSX_OpenGlCore, OSX_Metal, iPhone_Metal, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.log_parser>
after_build:
- [OSX_OpenGlCore, iPhone_Metal, XRQuest_OpenGLES3, XRQuest_Vulkan, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.log_parser>
- [OSX_OpenGlCore, iPhone_Metal, Linux_OpenGlCore, Linux_Vulkan]: <shared.platform.commands.log_parser>
- type: playmode
allow_cache: True
utr_flags:
Expand All @@ -150,7 +150,7 @@ test_platforms:
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>

- [all]: --editor-location=.Editor
- [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --editor-location=./WindowsEditor
- [OSX_Metal]: --editor-location=/Users/bokken/.Editor

- [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
Expand All @@ -166,7 +166,7 @@ test_platforms:
- [all]: <shared.platform.commands.unity_downloader_cli>
- [all]: <shared.platform.commands.call_utr>
after:
- [OSX_OpenGlCore, OSX_Metal, iPhone_Metal, Linux_OpenGlCore, Linux_Vulkan, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan,]: <shared.platform.commands.log_parser>
- [OSX_OpenGlCore, OSX_Metal, iPhone_Metal, Linux_OpenGlCore, Linux_Vulkan, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: <shared.platform.commands.log_parser>

- type: editmode
allow_cache: False
Expand All @@ -179,14 +179,14 @@ test_platforms:
- [all]: --scripting-backend=<SCRIPTING_BACKEND>
- [all]: --platform=editmode
- [all]: --extra-editor-arg="-colorspace=<COLORSPACE>"
- [Android_OpenGLES3, Android_Vulkan]: --platform=Android
- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --platform=Android
- [iPhone_Metal]: --platform=iOS

- [all]: --testproject=./TestProjects/<PROJECT_FOLDER>
- [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/<PROJECT_FOLDER>

- [all]: --editor-location=.Editor
- [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor
- [Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: --editor-location=./WindowsEditor
- [OSX_Metal]: --editor-location=/Users/bokken/.Editor

- [all]: --artifacts_path=TestProjects/<PROJECT_FOLDER>/test-results
Expand All @@ -199,16 +199,16 @@ test_platforms:

- [Win_DX11]: --extra-editor-arg="-playergraphicsapi=Direct3D11"
- [Win_DX12]: --extra-editor-arg="-playergraphicsapi=Direct3D12"
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
- [Android_OpenGLES3]: --extra-editor-arg="-playergraphicsapi=OpenGLES3"
- [Win_Vulkan, Linux_Vulkan, Android_Vulkan, XRQuest_Vulkan]: --extra-editor-arg="-playergraphicsapi=Vulkan"
- [Android_OpenGLES3, XRQuest_OpenGLES3]: --extra-editor-arg="-playergraphicsapi=OpenGLES3"
- [iPhone_Metal]: --extra-editor-arg="-playergraphicsapi=Metal"
commands:
- [Win_DX11, Win_DX12, Win_Vulkan]: <shared.platform.commands.turn_off_firewall>
- [all]: <shared.platform.commands.setup_utr>
- [all]: <shared.platform.commands.unity_downloader_cli>
- [all]: <shared.platform.commands.call_utr>
after:
- [OSX_OpenGlCore, OSX_Metal, iPhone_Metal, Linux_OpenGlCore, Linux_Vulkan, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan,]: <shared.platform.commands.log_parser>
- [OSX_OpenGlCore, OSX_Metal, iPhone_Metal, Linux_OpenGlCore, Linux_Vulkan, Android_OpenGLES3, Android_Vulkan, XRQuest_OpenGLES3, XRQuest_Vulkan]: <shared.platform.commands.log_parser>

platforms:
Win:
Expand Down Expand Up @@ -470,7 +470,7 @@ platforms:
flavor: b1.large
standalone_build:
type: Unity::VM
image: mobile/android-execution-r19:stable
image: sdet/gamecode_win10:stable
flavor: b1.large
commands:
[OpenGLES3, Vulkan]:
Expand All @@ -485,6 +485,7 @@ platforms:
set /p GIT_REVISIONDATE=<revdate.tmp
echo %GIT_REVISIONDATE%
del revdate.tmp
set ANDROID_SDK_ROOT=%cd%/WindowsEditor/Data/PlaybackEngines/AndroidPlayer/SDK
set unityVersion={{editor_versions.trunk_latest_internal.XRQuest.revision}}
set artifactPath=Boatattack/Quest
set jenkinsJob=SBR_Quest_RunTest
Expand Down
8 changes: 4 additions & 4 deletions .yamato/config/universal_perf_boatattack.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -310,12 +310,12 @@ platforms:
image: mobile/android-execution-r19:stable
flavor: b1.large
standalone_build:
type: Unity::mobile::android
image: mobile/android-execution-r19:stable
type: Unity::VM
image: sdet/gamecode_win10:stable
flavor: b1.large
performance_build_editmode:
type: Unity::mobile::android
image: mobile/android-execution-r19:stable
type: Unity::VM
image: sdet/gamecode_win10:stable
flavor: b1.large
- name: iPhone
apis:
Expand Down
Loading