diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile index 766ef3962d4..bce3f52e9cd 100644 --- a/.yamato/config/__shared.metafile +++ b/.yamato/config/__shared.metafile @@ -27,20 +27,123 @@ build_configs: - name: mono_apiNet4 scripting_backend: Mono2x api_level: NET_4_6 -color_spaces: - - Linear - - gamma +test_platforms: + - type: Standalone + utr_flags: + - [all]: --suite=playmode + - [all]: --timeout=1200 + - [all]: --reruncount=2 + - [all]: --scripting-backend= + - [all]: --extra-editor-arg="-colorspace=" + + - [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64 + - [Linux_OpenGlCore, Linux_Vulkan]: --platform=StandaloneLinux64 + - [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX + - [iPhone_Metal]: --platform=iOS + - [Android_OpenGLES3, Android_Vulkan]: --platform=Android + + - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-load-path=../../players + - [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-load-path=players + + - [all]: --artifacts_path=test-results + - [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects//test-results + + - [OSX_Metal]: --editor-location=/Users/bokken/.Editor + + - [Android_OpenGLES3, Android_Vulkan]: --architecture=ARM64 + - [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/ + - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-connection-ip=auto + + utr_flags_build: + - [all]: --suite=playmode + - [all]: --build-only + - [all]: --scripting-backend= + - [all]: --extra-editor-arg="-colorspace=" + + - [Win_DX11, Win_DX12, Win_Vulkan, Win_]: --platform=StandaloneWindows64 + - [Linux_OpenGlCore, Linux_Vulkan]: --platform=StandaloneLinux64 + - [OSX_OpenGlCore, OSX_Metal]: --platform=StandaloneOSX + - [iPhone_Metal]: --platform=iOS + - [Android_OpenGLES3, Android_Vulkan]: --platform=Android + + - [all]: --testproject=. + - [Android_OpenGLES3, Android_Vulkan]: --testproject=./TestProjects/ + - [iPhone_Metal]: --testproject=TestProjects/ + + - [all]: --editor-location=.Editor + - [Android_OpenGLES3, Android_Vulkan]: --editor-location=./WindowsEditor + + - [all]: --artifacts_path=test-results + - [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects//test-results + + - [Win_DX11, Win_DX12, Win_Vulkan, Win_, Linux_OpenGlCore, Linux_Vulkan]: --player-save-path=../../players + - [Android_OpenGLES3, Android_Vulkan, iPhone_Metal]: --player-save-path=players + + - [all]: --timeout=1200 + - [Android_OpenGLES3, Android_Vulkan]: --timeout=2700 + - [iPhone]: --timeout=1800 + + - [Linux_OpenGlCore]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxOpenGlCoreLinear" + - [Linux_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - [Win_DX11]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindowsDX11Linear" + - [Win_DX12]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindowsDX12Linear" + - [Win_Vulkan]: --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindowsVulkanLinear" + + - [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" + - [iPhone_Metal]: --extra-editor-arg="-playergraphicsapi=Metal" + + - [Android_OpenGLES3, Android_Vulkan]: --architecture=ARM64 + + - type: playmode + utr_flags: + - [all]: --suite=playmode + - [all]: --scripting-backend= + - [all]: --extra-editor-arg="-colorspace=" + - [all]: --reruncount=2 + + - [all]: --testproject=. + - [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/ + + - [all]: --editor-location=.Editor + - [OSX_Metal]: --editor-location=/Users/bokken/.Editor + + - [all]: --artifacts_path=test-results + - [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects//test-results + + - [Win_DX11]: --extra-editor-arg="-force-d3d11" + - [Win_DX12]: --extra-editor-arg="-force-d3d12" + - [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-force-vulkan" + - [Linux_OpenGlCore]: --extra-editor-arg="-force-glcore" + + - type: editmode + utr_flags: + - [all]: --suite=editor + - [all]: --reruncount=2 + - [all]: --scripting-backend= + - [all]: --extra-editor-arg="-colorspace=" + - [all]: --platform=editmode + + - [all]: --testproject=. + - [OSX_Metal]: --testproject=/Users/bokken/Graphics/TestProjects/ + + - [all]: --editor-location=.Editor + - [OSX_Metal]: --editor-location=/Users/bokken/.Editor + + - [all]: --artifacts_path=test-results + - [OSX_Metal]: --artifacts_path=/Users/bokken/Graphics/TestProjects//test-results + + - [Win_DX11]: --extra-editor-arg="-force-d3d11" + - [Win_DX12]: --extra-editor-arg="-force-d3d12" + - [Win_Vulkan, Linux_Vulkan]: --extra-editor-arg="-force-vulkan" + - [Linux_OpenGlCore]: --extra-editor-arg="-force-glcore" + platforms: Win: name: Win os: windows - apis: - - name: DX11 - cmd: -force-d3d11 - - name: DX12 - cmd: -force-d3d12 - - name: Vulkan - cmd: -force-vulkan components: - editor - il2cpp @@ -66,14 +169,6 @@ platforms: OSX: name: OSX os: macos - apis: - - name: Metal - exclude_test_platforms: - - editmode - - name: OpenGLCore - exclude_test_platforms: - - playmode_XR - - Standalone components: - editor - il2cpp @@ -96,16 +191,6 @@ platforms: Linux: name: Linux os: linux - apis: - - name: OpenGLCore - cmd: -force-glcore - exclude_test_platforms: - - Standalone - - playmode_XR - - name: Vulkan - cmd: -force-vulkan - exclude_test_platforms: - - playmode_XR components: - editor - il2cpp @@ -125,18 +210,6 @@ platforms: Android: name: Android os: android - apis: - - name: OpenGLES3 - exclude_test_platforms: - - editmode - - playmode - - playmode_XR - - name: Vulkan - - name: Vulkan - exclude_test_platforms: - - editmode - - playmode - - playmode_XR components: - editor - il2cpp @@ -153,12 +226,6 @@ platforms: iPhone: name: iPhone os: ios - apis: - - name: Metal - exclude_test_platforms: - - editmode - - playmode - - playmode_XR components: - editor - iOS diff --git a/.yamato/config/_abv.metafile b/.yamato/config/_abv.metafile index bdb8f29db29..fa8191b880f 100644 --- a/.yamato/config/_abv.metafile +++ b/.yamato/config/_abv.metafile @@ -6,13 +6,9 @@ abv: # specify the editor versions for which to create the expression trigger fo - name: VFX_HDRP - name: VFX_URP build_configs: - - name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 - - name: il2cpp_apiNet4 - scripting_backend: IL2CPP - api_level: NET_4_6 - color_spaces: + - mono_apiNet2 + - il2cpp_apiNet4 + color_spaces: - Linear weekly: extra_dependencies: # additional project jobs to run weekly diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index 1d395abc969..847c20b0349 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -6,65 +6,64 @@ test_platforms: - type: playmode - type: playmode name: playmode_XR - extra_utr_flags: - - --extra-editor-arg="-xr-tests" + utr_flags: + - [all]: --extra-editor-arg="-xr-tests" - type: playmode name: playmode_NonRenderGraph - extra_utr_flags: - - --extra-editor-arg="-non-rendergraph-tests" + utr_flags: + - [all]: --extra-editor-arg="-non-rendergraph-tests" - type: editmode - type: Standalone - timeout: - OSX_Metal: 2400 + utr_flags: + - [OSX_Metal]: --timeout=2400 platforms: - name: Win apis: - - DX11 - - DX12 - - Vulkan - overrides: - agents_project: - # default: package_ci_mac - default: - type: Unity::VM::GPU - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge - model: rtx2080 - editmode: - type: Unity::VM - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge - standalone: - type: Unity::VM::GPU - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge - model: rtx2080 - standalone_build: - type: Unity::VM - image: graphics-foundation/win10-dxr:stable - flavor: b1.xlarge + - name: DX11 + - name: DX12 + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear + agents_project: + # default: package_ci_mac + default: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:stable + flavor: b1.xlarge + model: rtx2080 + editmode: + type: Unity::VM + image: graphics-foundation/win10-dxr:stable + flavor: b1.xlarge + standalone: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:stable + flavor: b1.xlarge + model: rtx2080 + standalone_build: + type: Unity::VM + image: graphics-foundation/win10-dxr:stable + flavor: b1.xlarge - name: OSX apis: - - Metal + - name: Metal + exclude_test_platforms: + - name: editmode + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: Linux apis: - - Vulkan -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + - name: Vulkan + exclude_test_platforms: + - name: playmode_XR + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/hdrp_dxr.metafile b/.yamato/config/hdrp_dxr.metafile index 83f14e1a7bc..bc6f443b9fb 100644 --- a/.yamato/config/hdrp_dxr.metafile +++ b/.yamato/config/hdrp_dxr.metafile @@ -6,39 +6,26 @@ test_platforms: - type: playmode - type: playmode name: playmode_XR - extra_utr_flags: - - --extra-editor-arg="-xr-tests" + utr_flags: + - [all]: --extra-editor-arg="-xr-tests" - type: playmode name: playmode_NonRenderGraph - extra_utr_flags: - - --extra-editor-arg="-non-rendergraph-tests" + utr_flags: + - [all]: --extra-editor-arg="-non-rendergraph-tests" platforms: - name: Win apis: - - DX12 - overrides: - agents_project: - default: - type: Unity::VM::GPU - image: graphics-foundation/win10-dxr:stable - flavor: b1.large - model: rtx2080 -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + - name: DX12 + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear + agents_project: + default: + type: Unity::VM::GPU + image: graphics-foundation/win10-dxr:stable + flavor: b1.large + model: rtx2080 all: dependencies: - platform: Win diff --git a/.yamato/config/hdrp_hybrid.metafile b/.yamato/config/hdrp_hybrid.metafile index 9fd837f612a..148901cd2a4 100644 --- a/.yamato/config/hdrp_hybrid.metafile +++ b/.yamato/config/hdrp_hybrid.metafile @@ -3,52 +3,55 @@ project: folder: HDRP_HybridTests test_platforms: - type: playmode - extra_utr_flags: - - --compilation-errors-as-warnings + utr_flags: + - [all]: --compilation-errors-as-warnings - type: playmode name: playmode_XR - extra_utr_flags: - - --extra-editor-arg="-xr-tests" - - --compilation-errors-as-warnings + utr_flags: + - [all]: --extra-editor-arg="-xr-tests" + - [all]: --compilation-errors-as-warnings # - type: editmode - # extra_utr_flags: - # - --compilation-errors-as-warnings + # utr_flags: + # - [all]: --compilation-errors-as-warnings - type: Standalone - extra_utr_flags: - - --compilation-errors-as-warnings - extra_utr_flags_build: - - --compilation-errors-as-warnings - timeout: - OSX_Metal: 2400 + utr_flags: + - [all]: --compilation-errors-as-warnings + - [OSX_Metal]: --timeout=2400 + utr_flags_build: + - [all]: --compilation-errors-as-warnings + platforms: - name: Win apis: - - DX11 - - DX12 - - Vulkan + - name: DX11 + - name: DX12 + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: OSX apis: - - Metal + - name: Metal + exclude_test_platforms: + - name: editmode + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: Linux apis: - - OpenGLCore - - Vulkan -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + - name: OpenGLCore + exclude_test_platforms: + - name: Standalone + - name: playmode_XR + - name: Vulkan + exclude_test_platforms: + - name: playmode_XR + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/shadergraph.metafile b/.yamato/config/shadergraph.metafile index ac54619cd1d..7693a582f17 100644 --- a/.yamato/config/shadergraph.metafile +++ b/.yamato/config/shadergraph.metafile @@ -3,39 +3,41 @@ project: folder: ShaderGraph test_platforms: - type: Standalone - timeout: - OSX_Metal: 2400 + utr_flags: + - [OSX_Metal]: --timeout=2400 - type: playmode - type: editmode platforms: - name: Win apis: - - DX11 - - Vulkan + - name: DX11 + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: OSX apis: - - OpenGLCore - - Metal + - name: Metal + exclude_test_platforms: + - name: editmode + - name: OpenGLCore + exclude_test_platforms: + - name: Standalone + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: Linux apis: - - OpenGLCore - - Vulkan -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + - name: OpenGLCore + exclude_test_platforms: + - name: Standalone + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/shadergraph_stereo.metafile b/.yamato/config/shadergraph_stereo.metafile index 9cbd3b6b935..af94833d5fe 100644 --- a/.yamato/config/shadergraph_stereo.metafile +++ b/.yamato/config/shadergraph_stereo.metafile @@ -8,22 +8,10 @@ test_platforms: platforms: - name: Win apis: -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/smoke_test.metafile b/.yamato/config/smoke_test.metafile index e45b22fe5ac..ec712ba0bfe 100644 --- a/.yamato/config/smoke_test.metafile +++ b/.yamato/config/smoke_test.metafile @@ -8,23 +8,11 @@ test_platforms: platforms: - name: Win apis: - - DX11 -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + - name: DX11 + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/universal.metafile b/.yamato/config/universal.metafile index 56fb32b9b37..a29a45a7add 100644 --- a/.yamato/config/universal.metafile +++ b/.yamato/config/universal.metafile @@ -3,55 +3,86 @@ project: folder: UniversalGraphicsTest test_platforms: - type: Standalone - timeout: - OSX_Metal: 2400 - timeout_build: - Android: 2700 - iOS: 1800 - Win: 2000 + utr_flags: + - [OSX_Metal]: --timeout=2400 + utr_flags_build: + - [Android_OpenGles3, Android_Vulkan]: --timeout=2700 + - [Win_DX11, Win_DX12, Win_Vulkan]: --timeout=2000 + - [iPhone_Metal]: --timeout=1800 - type: playmode - type: editmode - type: playmode name: playmode_XR - extra_utr_flags: - - --extra-editor-arg="-xr-tests" + utr_flags: + - [all]: --extra-editor-arg="-xr-tests" platforms: - name: Win apis: - - DX11 - - DX12 - - Vulkan + - name: DX11 + - name: DX12 + - name: Vulkan + build_configs: + - name: il2cpp_apiNet4 + - name: mono_apiNet2 + color_spaces: + - Linear - name: OSX apis: - - Metal - - OpenGLCore + - name: Metal + exclude_test_platforms: + - name: editmode + - name: OpenGLCore + exclude_test_platforms: + - name: playmode_XR + - name: Standalone + build_configs: + - name: il2cpp_apiNet4 + - name: mono_apiNet2 + color_spaces: + - Linear - name: Linux - apis: - - Vulkan - - OpenGLCore + apis: + - name: OpenGLCore + exclude_test_platforms: + - name: Standalone + - name: playmode_XR + - name: Vulkan + exclude_test_platforms: + - name: playmode_XR + build_configs: + - name: il2cpp_apiNet4 + - name: mono_apiNet2 + color_spaces: + - Linear - name: Android apis: - - Vulkan - - OpenGLES3 + - name: OpenGLES3 + exclude_test_platforms: + - name: playmode + - name: editmode + - name: playmode_XR + - name: Vulkan + exclude_test_platforms: + - name: playmode + - name: editmode + - name: playmode_XR + build_configs: + - name: il2cpp_apiNet4 + - name: mono_apiNet2 + color_spaces: + - Linear - name: iPhone apis: - - Metal -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -- name: il2cpp_apiNet4 - scripting_backend: IL2CPP - api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + - name: Metal + exclude_test_platforms: + - name: playmode + - name: editmode + - name: playmode_XR + build_configs: + - name: il2cpp_apiNet4 + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/universal_hybrid.metafile b/.yamato/config/universal_hybrid.metafile index a83e9073761..7abd4381ff3 100644 --- a/.yamato/config/universal_hybrid.metafile +++ b/.yamato/config/universal_hybrid.metafile @@ -3,54 +3,60 @@ project: folder: UniversalHybridTest test_platforms: - type: Standalone - extra_utr_flags: - - --compilation-errors-as-warnings - timeout: - OSX_Metal: 2400 - timeout_build: - Android: 1800 - extra_utr_flags_build: - - --compilation-errors-as-warnings + utr_flags: + - [all]: --compilation-errors-as-warnings + - [OSX_Metal]: --timeout=2400 + utr_flags_build: + - [Android_OpenGles3, Android_Vulkan]: --timeout=1800 + - [all]: --compilation-errors-as-warnings - type: playmode - extra_utr_flags: - - --compilation-errors-as-warnings -# - type: editmode -# extra_utr_flags: -# - --compilation-errors-as-warnings -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + utr_flags: + - [all]: --compilation-errors-as-warnings platforms: - name: Win apis: - - DX11 -# - DX12 - - Vulkan + - name: DX11 + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: OSX apis: - - Metal -# - OpenGLCore + - name: Metal + exclude_test_platforms: + - name: playmode_XR + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: Linux apis: - - Vulkan - - OpenGLCore + - name: OpenGLCore + exclude_test_platforms: + - name: Standalone + - name: playmode_XR + - name: Vulkan + exclude_test_platforms: + - name: playmode_XR + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: Android apis: - - OpenGLES3 - - Vulkan + - name: OpenGLES3 + exclude_test_platforms: + - name: playmode + - name: playmode_XR + - name: Vulkan + exclude_test_platforms: + - name: playmode + - name: playmode_XR + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win @@ -64,5 +70,4 @@ all: build_config: mono_apiNet2 color_space: Linear test_platforms: - # - Standalone - playmode \ No newline at end of file diff --git a/.yamato/config/universal_perf_boatattack.metafile b/.yamato/config/universal_perf_boatattack.metafile index b0a6d3fd57e..107f24f3d71 100644 --- a/.yamato/config/universal_perf_boatattack.metafile +++ b/.yamato/config/universal_perf_boatattack.metafile @@ -3,64 +3,47 @@ project: folder: BoatAttack test_platforms: - type: Standalone - timeout_build: - Android: 2000 name: performance_playmode_runtime - is_performance: True - extra_utr_flags: - - --report-performance-data - - --performance-project-id=BoatAttack - extra_utr_flags_build: - - --extra-editor-arg="-executemethod Editor.Setup" - - --category=URP - - --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" - - --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" - - --extra-editor-arg="-packageundertestrev=%GIT_REVISION%" - - --extra-editor-arg="-packageundertestrevdate=%GIT_REVISIONDATE%" - - --extra-editor-arg="-packageundertestbranch=%GIT_BRANCH%" + utr_flags: + - [all]: --report-performance-data + - [all]: --performance-project-id=BoatAttack + utr_flags_build: + - [all]: --extra-editor-arg="-executemethod" --extra-editor-arg="Editor.Setup" + - [all]: --extra-editor-arg="-addscenetobuild=Assets/scenes/Testing/benchmark_island-static.unity" + - [all]: --extra-editor-arg="-packageundertestname=com.unity.render-pipelines.universal" + - [all]: --extra-editor-arg="-packageundertestrev=%GIT_REVISION%" + - [all]: --extra-editor-arg="-packageundertestrevdate=%GIT_REVISIONDATE%" + - [all]: --extra-editor-arg="-packageundertestbranch=%GIT_BRANCH%" + - [Win_DX11, Win_DX12, Win_Vulkan]: --extra-editor-arg="-stripenginecode-" + - [Win_DX11, Win_DX12, Win_Vulkan]: --extra-editor-arg="-managedstrippinglevel=Low" + - [Win_DX11, Win_DX12, Win_Vulkan]: --extra-editor-arg="-allowdebugging-" + - [all]: --category=URP # - type: editmode # name: performance_editmode_build # is_performance: True -# extra_utr_flags: -# - --testfilter=Build -# - --report-performance-data -# - --performance-project-id=BoatAttack +# utr_flags: +# - [all]: --report-performance-data +# - [all]: --performance-project-id=BoatAttack +# - [all]: --testfilter=Build +# - [iPhone_Metal]: --platform=iOS platforms: - name: Win - extra_utr_flags_build: - - --extra-editor-arg="-stripenginecode-" - - --extra-editor-arg="-managedstrippinglevel=Low" - - --extra-editor-arg="-allowdebugging-" apis: - - DX11 -# - Vulkan -# - name: OSX -# apis: -# - Metal -# - OpenGLCore + - name: DX11 + build_configs: + - name: il2cpp_apiNet4 + - name: mono_apiNet2 + color_spaces: + - Linear - name: Android apis: - - Vulkan - - OpenGLES3 -# - name: iPhone -# apis: -# - Metal -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -- name: il2cpp_apiNet4 - scripting_backend: IL2CPP - api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + - name: Vulkan + - name: OpenGLES3 + build_configs: + - name: il2cpp_apiNet4 + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/universal_stereo.metafile b/.yamato/config/universal_stereo.metafile index 96057d1bbce..175c7f46159 100644 --- a/.yamato/config/universal_stereo.metafile +++ b/.yamato/config/universal_stereo.metafile @@ -3,29 +3,17 @@ project: folder: UniversalGfxTestStereo test_platforms: - type: Standalone - extra_utr_flags: - - compilation-errors-as-warnings + utr_flags: + - [all]: compilation-errors-as-warnings # - type: playmode - type: editmode platforms: - name: Win apis: -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/update_assetstore.metafile b/.yamato/config/update_assetstore.metafile index b1c3d94f17e..245cb2a75b9 100644 --- a/.yamato/config/update_assetstore.metafile +++ b/.yamato/config/update_assetstore.metafile @@ -7,28 +7,20 @@ test_platforms: platforms: - name: Win apis: - - DX11 - - Vulkan + - name: DX11 + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear # - name: OSX # apis: -# - OpenGLCore -# - Metal -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma +# - name: OpenGLCore +# - name: Metal +# build_configs: +# - name: mono_apiNet2 +# color_spaces: +# - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/update_boatattack.metafile b/.yamato/config/update_boatattack.metafile index 7da0ac06761..e0d0c23b1fc 100644 --- a/.yamato/config/update_boatattack.metafile +++ b/.yamato/config/update_boatattack.metafile @@ -7,28 +7,20 @@ test_platforms: platforms: - name: Win apis: - - DX11 - - Vulkan + - name: DX11 + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear # - name: OSX # apis: -# - OpenGLCore -# - Metal -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma +# - name: OpenGLCore +# - name: Metal +# build_configs: +# - name: mono_apiNet2 +# color_spaces: +# - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/update_template.metafile b/.yamato/config/update_template.metafile index 83c6bd9e54e..058c771c648 100644 --- a/.yamato/config/update_template.metafile +++ b/.yamato/config/update_template.metafile @@ -7,28 +7,20 @@ test_platforms: platforms: - name: Win apis: - - DX11 - - Vulkan + - name: DX11 + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear # - name: OSX # apis: -# - OpenGLCore -# - Metal -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma +# - name: OpenGLCore +# - name: Metal +# build_configs: +# - name: mono_apiNet2 +# color_spaces: +# - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/vfx_hdrp.metafile b/.yamato/config/vfx_hdrp.metafile index 8d99104b7d6..60054eb81eb 100644 --- a/.yamato/config/vfx_hdrp.metafile +++ b/.yamato/config/vfx_hdrp.metafile @@ -3,42 +3,42 @@ project: folder: VisualEffectGraph_HDRP test_platforms: - type: Standalone - timeout: - OSX_Metal: 2400 + utr_flags: + - [OSX_Metal]: --timeout=2400 - type: playmode - type: playmode name: playmode_XR - extra_utr_flags: - - --extra-editor-arg="-xr-tests" + utr_flags: + - [all]: --extra-editor-arg="-xr-tests" - type: editmode platforms: - name: Win apis: - - DX11 - # - DX12 - - Vulkan + - name: DX11 + # - name: DX12 + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: OSX apis: - - Metal + - name: Metal + exclude_test_platforms: + - name: editmode + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: Linux apis: - - Vulkan -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma + - name: Vulkan + exclude_test_platforms: + - name: playmode_XR + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear all: dependencies: - platform: Win diff --git a/.yamato/config/vfx_urp.metafile b/.yamato/config/vfx_urp.metafile index 123f419dbe1..ddd204c0467 100644 --- a/.yamato/config/vfx_urp.metafile +++ b/.yamato/config/vfx_urp.metafile @@ -3,47 +3,61 @@ project: folder: VisualEffectGraph_URP test_platforms: - type: Standalone - timeout: - OSX_Metal: 2400 + utr_flags: + - [OSX_Metal]: --timeout=2400 - type: playmode # - type: editmode platforms: - name: Win apis: - - DX11 -# - DX12 - - Vulkan + - name: DX11 + # - name: DX12 + - name: Vulkan + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: OSX apis: - - Metal - - OpenGLCore + - name: Metal + exclude_test_platforms: + - name: playmode_XR + - name: OpenGLCore + exclude_test_platforms: + - name: playmode_XR + - name: Standalone + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear - name: Linux apis: - - Vulkan - - OpenGLCore + - name: OpenGLCore + exclude_test_platforms: + - name: Standalone + - name: playmode_XR + - name: Vulkan + exclude_test_platforms: + - name: playmode_XR + build_configs: + - name: mono_apiNet2 + color_spaces: + - Linear # - name: Android # apis: -# - Vulkan -# - OpenGLES3 +# - name: Vulkan +# - name: OpenGLES3 +# build_configs: +# - name: mono_apiNet2 +# color_spaces: +# - Linear # - name: iPhone # apis: -# - Metal -build_configs: -#- name: il2cpp_apiNet2 -# scripting_backend: IL2CPP -# api_level: NET_2_0 -#- name: il2cpp_apiNet4 -# scripting_backend: IL2CPP -# api_level: NET_4_6 -- name: mono_apiNet2 - scripting_backend: Mono2x - api_level: NET_2_0 -#- name: mono_apiNet4 -# scripting_backend: Mono2x -# api_level: NET_4_6 -color_spaces: - - Linear -# - gamma +# - name: Metal +# build_configs: +# - name: mono_apiNet2 +# color_spaces: +# - Linear all: dependencies: - platform: Win diff --git a/.yamato/docs/readme.md b/.yamato/docs/readme.md index 57666429985..936adb8abda 100644 --- a/.yamato/docs/readme.md +++ b/.yamato/docs/readme.md @@ -59,11 +59,41 @@ The majority of changes are introduced within metafiles (*.yamato/config/\*.meta - If name not specified, name it set to type. Name is used for creating Yamato job ids and excluding testplatforms. If setting up e.g. two playmode types with different flags, renaming must be used, otherwise (due to matching job id) one job overrides the other. - If a specific platform requires flags different from what is marked in `utr_utils.py`, they are to be configured in the corresponding platform cmd file. Either _a)_ override flag value with the optional parameters _b)_ cancel the flag by overriding with `None` (make sure the function expects such value for such flag though), or _c)_ append additional platform specific flags to the utr_flags list - Exclude testplatforms for platforms by specifying the testplatform NAME (not type) in `__shared.metafile` -- Example: extending the default playmode for a specific project performance tests (this takes base playmode flags, and appends these for all platforms, unless specified otherwise in platform cmd file.) Note: when adding extra args to a standalone job, build flags can be specified separately by `extra_utr_flags_build` (scroll down to see project metafile docs) +- Example: extending the default playmode for a specific project performance tests (this takes base playmode flags, and appends these for all platforms, unless specified otherwise in platform cmd file.) Note: when adding extra args to a standalone job, build flags can be specified separately by `utr_flags_build` (scroll down to see project metafile docs) ``` - type: playmode name: playmode_perf_build - extra_utr_flags: + utr_flags: + - --scripting-backend=il2cpp + - --timeout=1200 + - --performance-project-id=URP_Performance + - --testfilter=Build + - --suite=Editor + ``` + If this platform should not be included eg for IPhone, then specify it in `__shared.metafile` like + ``` + iPhone: + name: iPhone + os: ios + apis: + - name: Metal + exclude_test_platforms: + - editmode + - ... + - playmode_perf_build + ``` + + +### Custom test platforms: +- There are 3 base test platforms to choose from: standalone (build), playmode, editmode. These can be extended by renaming them, and/or adding additional utr on top of existing ones. Their corresponding base UTR flags are found in `ruamel/jobs/shared/utr_utils.py` +- If name not specified, name it set to type. Name is used for creating Yamato job ids and excluding testplatforms. If setting up e.g. two playmode types with different flags, renaming must be used, otherwise (due to matching job id) one job overrides the other. +- If a specific platform requires flags different from what is marked in `utr_utils.py`, they are to be configured in the corresponding platform cmd file. Either _a)_ override flag value with the optional parameters _b)_ cancel the flag by overriding with `None` (make sure the function expects such value for such flag though), or _c)_ append additional platform specific flags to the utr_flags list +- Exclude testplatforms for platforms by specifying the testplatform NAME (not type) in `__shared.metafile` +- Example: extending the default playmode for a specific project performance tests (this takes base playmode flags, and appends these for all platforms, unless specified otherwise in platform cmd file.) Note: when adding extra args to a standalone job, build flags can be specified separately by `utr_flags_build` (scroll down to see project metafile docs) + ``` + - type: playmode + name: playmode_perf_build + utr_flags: - --scripting-backend=il2cpp - --timeout=1200 - --performance-project-id=URP_Performance @@ -151,6 +181,7 @@ The majority of changes are introduced within metafiles (*.yamato/config/\*.meta - Workflow in short: - Update job runs nightly on target-branch. It merges target-branch into ci-branch (syncs), gets new revisions for all tracks and pushes these together with updated ymls to ci branch - Merge job is triggered on changes to editor version files on ci-branch. It runs a merge job per each track, which (if the ABV with updated revisions passes green) pushes the corresponding editor revisions file to target-branch. Once everything is done, it regenerates all ymls based on whichever revisions have reached master branch. + - NOTE: _Merge [track] revisions to master [ABV]_ job only merges the `latest_editor_versions_[track].metafile`, but doesn't update ymls (because its meant as a child-dependency of the merge-all job). To update the ymls, run _Merge all_ job or make a manual PR with updated ymls. - Workflow in details is on figure below ![Editor pinning flow](editor_pinning.png) @@ -174,6 +205,12 @@ The majority of changes are introduced within metafiles (*.yamato/config/\*.meta - What are smoke tests? Blank Unity projects containing all SRP packages (and default packages) to make sure all packages work with each other - Why does OpenGLCore not have standalone? Because the GPU is simulated and this job is too resource heavy for these machines - What happens to editor pinning if ABV is red? If ABV is red, then editor pinning merge job fails, i.e. the target branch (on which ABV runs) will not get editor revisions updated automatically. To remedy this, there are 2 merge jobs, one postfixed with \[ABV\] (triggered automatically, dependent on ABV), other with \[manual\] (triggered manually, not dependent on ABV). If editor revisions must be updated despite the red ABV, then the manual job must be triggered. +- How to UTR flags work? UTR flag order is preserved while parsing in metafiles, and shared metafile is parsed before project metafile. Thus, if shared metafile has `[all]: --timeout=1200, [Win_DX11, Win_DX12]: --timeout=3000` and project metafile has `[Win_DX11]: --timeout=5000`, this will result in DX11 having 5000, DX12 having 3000, and everything else 1200. Note that flags end up alphabetically sorted in the final ymls. +- How are nested UTR flags overriden? Flags are overriden if they are specified multiple times: checking if a flag is already specified is done by checking the flag 'key', which is the flag without its value. This applies also for nested keys, see below cases that are supported (refer to _utr_utils.py_ for implementation logic): + - `--timeout=1800`: key is `--timeout` + - `--extra-editor-arg="-executemethod CustomBuild.BuildLinuxOpenGlCoreLinear"`: key is `--extra-editor-arg="-executemethod` + - `--extra-editor-arg="-playergraphicsapi=Direct3D11"`: key is `--extra-editor-arg="-playergraphicsapi"` + # Configuration files (metafiles) @@ -182,6 +219,9 @@ The majority of changes are introduced within metafiles (*.yamato/config/\*.meta # main branch for ci triggers etc target_branch: master +# specifies the branch on which editor pinning ci runs +target_branch_editor_ci: ci/editor-pinning + # target editor version used for this branch target_editor: trunk @@ -194,6 +234,7 @@ editors: editor_pinning: True #use editor pinning for this track nightly: True #run the _Nightly job nightly weekly: True #run the _Weekly job weekly + abv_pr: True #trigger ABV on PRs # run editor pinning for 2020.2, and set up a recurrent nightly - track: 2020.2 @@ -228,18 +269,36 @@ editors: rerun_strategy: always editor_pinning: False #custom revision always has editor pinning as false fast: False #custom revision always has fast as false + +# specify list of build configs as follows (name is used to retrieve the configuration in project files) +build_configs: + - name: il2cpp_apiNet2 + scripting_backend: IL2CPP + api_level: NET_2_0 + +# specify utr flags for 3 base testplatforms +test_platforms: + - type: Standalone + utr_flags: # flags for standalone jobs + - [all]: --scripting-backend= # use <> for values which must be replaced inside python (check utr_utils.py) + - [all]: --timeout=1200 # use [all] if flag applies to all platform_api combinations + - [Win_DX11, OSX_Metal]: --timeout=2000 # use list of [platform_api] to add a flag for specific platform_api combinations. If flag is specified multiple times, last specification overwrites preceding ones + - ... + utr_flags_build: # flags for standaline split build jobs + - ... + - type: playmode + utr_flags: + - ... + - type: editmode + utr_flags: + - ... + + # specifies platform details for each platform platforms: Win: name: Win os: windows - apis: - - name: DX11 - cmd: -force-d3d11 - - name: DX12 - cmd: -force-d3d12 - - name: Vulkan - cmd: -force-vulkan components: - editor - il2cpp @@ -273,11 +332,6 @@ platforms: OSX: name: OSX os: macos - apis: - - name: Metal - - name: OpenGLCore - exclude_test_platforms: # specify which test platforms to exclude for this api - - Standalone components: - editor - il2cpp @@ -348,14 +402,6 @@ weekly: # all_project_ci_nightly job configuration test_platforms: - playmode_NonRenderGraph - ... -smoke_test: # smoke tests configuration. Agents refer back to __shared.metafile - folder: SRP_SmokeTest - agent: sdet_win_large # (used for editmode) - agent_gpu: sdet_win_large_gpu - test_platforms: # test platforms to create smoke tests for - - Standalone - - playmode - - editmode trunk_verification: # jobs to include in trunk verification job dependencies: @@ -367,10 +413,6 @@ trunk_verification: # jobs to include in trunk verification job - editmode - ... -# optionally to override editors from __shared.metafile -override_editors: - - version: trunk - rerun_strategy: always ``` ### _editor.metafile: configuration for editor priming jobs @@ -465,9 +507,9 @@ agent_pack: package_ci_win_large agent_publish: package_ci_win_large agent_publish_all: package_ci_ubuntu_large -# optionally to override editors from __shared.metafile -override_editors: - - version: trunk +# specify track on which publish job dependencies run on +publish_all_tracks: + - trunk ``` @@ -496,9 +538,6 @@ packages: agent_promote: package_ci_win_large agent_auto_version: package_ci_ubuntu_large -# override editors from __shared.metafile file -override_editors: - - version: trunk ``` ### _templates.metafile: template jobs configuration (highly similar for packages configuration) @@ -527,9 +566,6 @@ agent_pack: package_ci_win_large agent_test: package_ci_win_large agent_all_ci: package_ci_win_large -# optionally to override editors from __shared.metafile -override_editors: - - version: trunk ``` @@ -544,90 +580,45 @@ project: # test platforms to generate jobs for test_platforms: + test_platforms: - type: Standalone - extra_utr_flags: # specify additional utr flags to run for this project and test platform - - --some-extra-utr-flag - extra_utr_flags_build: - - --some-extra-utr-flag # additional utr flags for build (only available for standalone type) - timeout: 3000 # overrides default timeout 1200 for all platforms which use this property in cmd files - # timeout: # overrides default timeout per platform (for unspecified platforms, default is used) - # OSX_Metal: 2400 - # Win: 3000 - timeout_build: 3000 # overrides default timeout 1200 for all platforms which use this property in cmd files (only for split build jobs) - # timeout_build: # overrides default timeout per platform (for unspecified platforms, default is used) - # Win: 3000 + utr_flags: # specify flags same way as in shared.metafile + - [OSX_Metal]: --timeout=2400 # override timeout flag from shared.metafile for standalone job OSX_Metal + utr_flags_build: + - [Android_OpenGles3, Android_Vulkan]: --timeout=2700 + - [Win_DX11, Win_DX12, Win_Vulkan]: --timeout=2000 + - [iPhone_Metal]: --timeout=1800 - type: playmode - type: editmode - - type: playmode # custom testplatform: specify the 'base' type, name it to what you want, and add any additional flags + - type: playmode name: playmode_XR - extra_utr_flags: - - --extra-editor-arg="-xr-tests" + utr_flags: + - [all]: --extra-editor-arg="-xr-tests" # add additional flag to playmode XR on top of normal playmode flags # platforms to use (platform details obtained from __shared.metafile) # platforms can be overridden by using the same structure from shared platforms: - - name: OSX - apis: - - Metal - - OpenGLCore - - name: Linux - apis: - - Vulkan - - OpenGLCore - - name: Android - apis: - - Vulkan - - OpenGLES3 - - name: iPhone - apis: - - Metal - - name: Win - apis: - - DX11 - - DX12 - - Vulkan - name: Win apis: - - DX11 - - DX12 - - Vulkan - ## override example for Win - # overrides: # allows to override keys under __shared platform section (copycmd, editorpath, agent_package, agents_project) - # copycmd: your new copy cmd - # editorpath: your new editor path - # agents_project: - # default: - # type: Unity::VM::GPU - # image: graphics-foundation/win10-dxr:stable - # flavor: b1.xlarge - # model: rtx2080 - # editmode: - # type: Unity::VM - # image: graphics-foundation/win10-dxr:stable - # flavor: b1.xlarge - # standalone: - # type: Unity::VM::GPU - # image: graphics-foundation/win10-dxr:stable - # flavor: b1.xlarge - # model: rtx2080 - # standalone_build: - # type: Unity::VM - # image: graphics-foundation/win10-dxr:stable - # flavor: b1.xlarge - # model: rtx2080 + - name: DX11 + exclude_test_platforms: # exclude testplatforms for this specific api by referencing their name + - name: editmode + - name: DX12 + - name: Vulkan + build_configs: # specify build configs for this platform by their name in shared.metafile + - name: il2cpp_apiNet4 + - name: mono_apiNet2 + color_spaces: # specify color spaces + - Linear + - Gamma + - name: OSX + ... # which jobs to run under All_{project_name} job # this is the same structure as in abv nightly extra dependencies all: dependencies: - - platform: Win - api: DX11 - test_platforms: - - Standalone - - editmode - - playmode - - playmode_XR - - platform: OSX + - platform: OSX # use this to refer to the current project api: Metal test_platforms: - Standalone @@ -641,11 +632,6 @@ all: all: true - ... -# optionally to override editors from __shared.metafile -override_editors: - - version: trunk - rerun_strategy: always - ``` diff --git a/.yamato/hdrp-linux-vulkan.yml b/.yamato/hdrp-linux-vulkan.yml index 915dc890bf0..9d43ee4df0c 100644 --- a/.yamato/hdrp-linux-vulkan.yml +++ b/.yamato/hdrp-linux-vulkan.yml @@ -17,7 +17,7 @@ HDRP_Linux_Vulkan_playmode_mono_apiNet2_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -37,7 +37,7 @@ HDRP_Linux_Vulkan_playmode_NonRenderGraph_mono_apiNet2_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-non-rendergraph-tests" --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-non-rendergraph-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -57,7 +57,7 @@ HDRP_Linux_Vulkan_editmode_mono_apiNet2_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testproject=. artifacts: logs: paths: @@ -74,7 +74,7 @@ HDRP_Linux_Vulkan_Standalone_mono_apiNet2_Linear_trunk: commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - - cd TestProjects/HDRP_RuntimeTests && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && ./utr --artifacts_path=test-results --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --scripting-backend=Mono2x --suite=playmode --timeout=1200 artifacts: logs: paths: @@ -97,7 +97,7 @@ Build_HDRP_Linux_Vulkan_Player_mono_apiNet2_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --extra-editor-arg="-playergraphicsapi=Vulkan" --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testproject=. --timeout=1200 artifacts: logs: paths: @@ -121,7 +121,7 @@ HDRP_Linux_Vulkan_playmode_mono_apiNet2_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -145,7 +145,7 @@ HDRP_Linux_Vulkan_playmode_NonRenderGraph_mono_apiNet2_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-non-rendergraph-tests" --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-non-rendergraph-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -169,7 +169,7 @@ HDRP_Linux_Vulkan_editmode_mono_apiNet2_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr - chmod +x TestProjects/HDRP_Tests/utr - cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan" + - cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testproject=. artifacts: logs: paths: @@ -190,7 +190,7 @@ HDRP_Linux_Vulkan_Standalone_mono_apiNet2_Linear_CUSTOM-REVISION: commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - - cd TestProjects/HDRP_RuntimeTests && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --timeout=1200 + - cd TestProjects/HDRP_RuntimeTests && ./utr --artifacts_path=test-results --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --scripting-backend=Mono2x --suite=playmode --timeout=1200 artifacts: logs: paths: @@ -216,7 +216,7 @@ Build_HDRP_Linux_Vulkan_Player_mono_apiNet2_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr - chmod +x TestProjects/HDRP_RuntimeTests/utr - cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --extra-editor-arg="-playergraphicsapi=Vulkan" --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testproject=. --timeout=1200 artifacts: logs: paths: diff --git a/.yamato/hdrp-osx-metal.yml b/.yamato/hdrp-osx-metal.yml index a8e3ef18fa5..4608a917b63 100644 --- a/.yamato/hdrp-osx-metal.yml +++ b/.yamato/hdrp-osx-metal.yml @@ -20,7 +20,7 @@ HDRP_OSX_Metal_playmode_mono_apiNet2_Linear_trunk: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -47,7 +47,7 @@ HDRP_OSX_Metal_playmode_XR_mono_apiNet2_Linear_trunk: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-xr-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -74,7 +74,7 @@ HDRP_OSX_Metal_playmode_NonRenderGraph_mono_apiNet2_Linear_trunk: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-non-rendergraph-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-non-rendergraph-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -101,7 +101,7 @@ HDRP_OSX_Metal_Standalone_mono_apiNet2_Linear_trunk: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/HDRP_RuntimeTests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/ @@ -129,7 +129,7 @@ HDRP_OSX_Metal_playmode_mono_apiNet2_Linear_CUSTOM-REVISION: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -160,7 +160,7 @@ HDRP_OSX_Metal_playmode_XR_mono_apiNet2_Linear_CUSTOM-REVISION: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-xr-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -191,7 +191,7 @@ HDRP_OSX_Metal_playmode_NonRenderGraph_mono_apiNet2_Linear_CUSTOM-REVISION: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-non-rendergraph-tests"" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-non-rendergraph-tests" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests" UTR_RESULT=$? mkdir -p TestProjects/HDRP_Tests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/ @@ -222,7 +222,7 @@ HDRP_OSX_Metal_Standalone_mono_apiNet2_Linear_CUSTOM-REVISION: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/HDRP_RuntimeTests/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/ diff --git a/.yamato/hdrp-win-dx11.yml b/.yamato/hdrp-win-dx11.yml index 1bcfa04f32d..904343f31d6 100644 --- a/.yamato/hdrp-win-dx11.yml +++ b/.yamato/hdrp-win-dx11.yml @@ -22,7 +22,7 @@ HDRP_Win_DX11_playmode_mono_apiNet2_Linear_trunk: set /p GIT_REVISIONDATE= 1 and flag_keys[1].startswith('"-') and len(flag_keys[1].split(' '))>1: # for cases with additional flag nested inside with space, e.g --extra-editor-arg="-executemethod Editor.Setup" + flag_key = f'{flag_keys[0]}={flag_keys[1].split(" ")[0]}' + else: # most of the cases (--flag=value) + flag_key = flag_keys[0] + + # handle all dynamic flags + flag = flag.replace('',build_config["scripting_backend"]) + flag = flag.replace('',color_space) + flag = flag.replace('',project_folder) + + # check if such a flag is already present, if it is then overwrite. otherwise just append it + existing_indices = [i for i, existing_flag in enumerate(flags) if flag_key in existing_flag] + if flag_key != '--extra-editor-arg' and len(existing_indices)>0: + flags[existing_indices[0]]=flag + else: + flags.append(flag) + return sorted(flags) -def utr_editmode_flags(suite='editor', platform='editmode', testproject='.', editor_location='.Editor', artifacts_path=PATH_TEST_RESULTS, scripting_backend='il2cpp', api_level='NET_4_6', color_space='Linear'): - '''Sets: suite, platform, testproject, editor-location, artifacts-path. - Cancellable: none of them''' - flags = [ - f'--suite={suite}', - f'--platform={platform}', - f'--testproject={testproject}', - f'--editor-location={editor_location}', - f'--artifacts_path={artifacts_path}', - f'--scripting-backend={scripting_backend}', - #f'--extra-editor-arg="-apicompatibilitylevel={api_level}"', - f'--extra-editor-arg="-colorspace={color_space}"', - f'--reruncount=2' - ] - return [f for f in flags if f] - -def utr_standalone_not_split_flags(platform_spec, suite='playmode', platform='Standalone', testproject='.', editor_location='.Editor', artifacts_path=PATH_TEST_RESULTS, player_load_path='../../players', player_conn_ip='auto', scripting_backend='il2cpp', api_level='NET_4_6', color_space='Linear'): - '''Sets: suite, platform, artifacts-path, testproject, editor-location, timeout. - Cancellable: timeout''' - flags = [ - f'--suite={suite}', - f'--platform={platform}{platform_spec}', - f'--artifacts_path={artifacts_path}', - f'--testproject={testproject}', - f'--editor-location={editor_location}', - f'--scripting-backend={scripting_backend}', - #f'--extra-editor-arg="-apicompatibilitylevel={api_level}"', - f'--extra-editor-arg="-colorspace={color_space}"', - f'--reruncount=2' - ] - return [f for f in flags if f] - - -def utr_standalone_split_flags(platform_spec, suite='playmode', platform='Standalone', testproject='.', editor_location='.Editor', artifacts_path=PATH_TEST_RESULTS, player_load_path='../../players', player_conn_ip='auto', scripting_backend='il2cpp', api_level='NET_4_6', color_space='Linear'): - '''Sets: suite, platform, artifacts-path, timeout, player-load-path, player-connection-ip. - Cancellable: timeout, player-load-path, player-connection-ip''' - flags = [ - f'--suite={suite}', - f'--platform={platform}{platform_spec}', - f'--artifacts_path={artifacts_path}', - f'--player-load-path={player_load_path}' if player_load_path!=None else '', - f'--player-connection-ip={player_conn_ip}' if player_conn_ip!=None else '', - f'--scripting-backend={scripting_backend}', - #f'--extra-editor-arg="-apicompatibilitylevel={api_level}"', - f'--extra-editor-arg="-colorspace={color_space}"', - f'--reruncount=2' - ] - return [f for f in flags if f] - - -def utr_standalone_build_flags(platform_spec, suite='playmode', platform='Standalone', testproject='.', editor_location='.Editor', graphics_api='', artifacts_path=PATH_TEST_RESULTS, player_save_path='../../players', scripting_backend='il2cpp', api_level='NET_4_6', color_space='Linear'): - '''Sets: suite, platform, testproject, editor-location, artifacts-path, timeout, player-save-path, build-only. - Cancellable: timeout, player-save-path''' - if graphics_api.startswith('DX'): - graphics_api = "Direct3D" + graphics_api[2:] - - flags = [ - f'--suite={suite}', - f'--platform={platform}{platform_spec}', - f'--testproject={testproject}', - f'--extra-editor-arg="-playergraphicsapi={graphics_api}"', - f'--editor-location={editor_location}', - f'--artifacts_path={artifacts_path}', - f'--player-save-path={player_save_path}' if player_save_path!=None else '', - f'--build-only', - f'--scripting-backend={scripting_backend}', - #f'--extra-editor-arg="-apicompatibilitylevel={api_level}"', - f'--extra-editor-arg="-colorspace={color_space}"' - ] - return [f for f in flags if f] diff --git a/.yamato/ruamel/metafile_parser.py b/.yamato/ruamel/metafile_parser.py index 2027c3efaeb..8d601f0cc92 100644 --- a/.yamato/ruamel/metafile_parser.py +++ b/.yamato/ruamel/metafile_parser.py @@ -9,7 +9,7 @@ def format_metafile(metafile, shared, latest_editor_versions, unfold_agents_root metafile['target_branch_editor_ci'] = metafile.get('target_branch_editor_ci', shared.get('target_branch_editor_ci')) metafile['platforms'] = _unfold_platforms(metafile, shared) metafile = _unfold_individual_agents(metafile, shared, root_keys=unfold_agents_root_keys) - metafile = _unfold_test_platforms(metafile, shared, root_keys=unfold_test_platforms_root_keys) + metafile = _unfold_test_platforms(metafile, shared) return metafile def _get_editors(metafile, shared, latest_editor_versions): @@ -19,14 +19,38 @@ def _get_editors(metafile, shared, latest_editor_versions): if editor["editor_pinning"]: editor['revisions'] = {} revisions = [{k:v} for k,v in latest_editor_versions[editor['track']]['editor_versions'].items() if str(editor['track']) in k] # get all revisions for this track + # loop over the list of dictionaries to get the revisions into proper dictionary format for rev in revisions: - for k,v in rev.items(): # TODO loops over the single dict value, see if there is a better way + for k,v in rev.items(): editor['revisions'][k] = v #print(json.dumps(editors, indent=2)) return editors +def _unfold_platforms(metafile, shared): + + platforms = [] + for m_plat in metafile.get('platforms',[]): + s_plat = shared['platforms'][m_plat['name']] + # join details from the shared and project metafile platform (with metafile overwriting shared in case of same keys) + joint_plat = {**s_plat, **m_plat} + + # handle cases where api not specified (stereo projects) + if joint_plat.get('apis')=="" or joint_plat.get('apis')==None: + joint_plat['apis'] = [{ + "name": "" + }] + + # retrieve build configs from shared.metafile based on the name specified under project.metafile platforms + build_configs = [] + for build_config_name in m_plat.get("build_configs",[]): + build_configs.extend([bc for bc in shared["build_configs"] if bc["name"]==build_config_name["name"]]) + joint_plat["build_configs"] = build_configs + + platforms.append(joint_plat) + + return platforms def _unfold_individual_agents(metafile, shared, root_keys=[]): '''Unfolds all agents by their alias names corresponding to 'non_project_agents' in the shared metafile. @@ -46,74 +70,29 @@ def _unfold_individual_agents(metafile, shared, root_keys=[]): return metafile -def _unfold_platforms(metafile, shared): - '''Unfolds the metafile platform details by retrieving the corresponding platform from shared metafile, and then adjusting the details - to necessery level (removes unwanted apis from the shared platform object, - overrides all specified keys and unfolds agent aliases (if any overriden agent is specified by alias). - Returns the new formatted 'platforms' section''' - - formatted_platforms = [] - for platform_meta in metafile.get('platforms',[]): - platform_formatted = deepcopy(shared['platforms'][platform_meta['name']]) +def _unfold_test_platforms(metafile, shared): + '''Concatenates test platform details from shared and project metafiles''' + + test_platforms = [] + for tp in metafile.get("test_platforms", []): + + # initialize possibly empty properties + tp["name"] = tp["type"] if not tp.get("name") else tp.get("name") + tp["utr_flags"] = [] if not tp.get("utr_flags") else tp.get("utr_flags") + if tp["type"].lower()=="standalone": + tp["utr_flags_build"] = [] if not tp.get("utr_flags_build") else tp.get("utr_flags_build") - # remove unwanted apis from deepcopy - if platform_meta.get('apis') is not None: - accepted_apis = [] - for api_shared in platform_formatted['apis']: - if api_shared['name'].lower() in map(str.lower, platform_meta['apis']): - accepted_apis.append(dict(api_shared)) - platform_formatted['apis'] = accepted_apis - else: - platform_formatted['apis'] = [{"name" : ""}] # needed for stereos - - # allow to override all keys - if platform_meta.get('overrides', None) is not None: - for override_key in platform_meta['overrides'].keys(): - - # replace any overriden key with whats found in metafile - platform_formatted[override_key] = (platform_meta['overrides'][override_key]) - - # replace all named agents with actual agent dicts (unfold) - # e.g. if one of the non_project_agent names is used instead - if override_key.lower() == 'agent_package': - agent_name = platform_meta['overrides'][override_key] - platform_formatted[override_key] = shared['non_project_agents'][agent_name] - if override_key.lower() == 'agents_project': - for agent_key, agent_name in platform_meta['overrides'][override_key].items(): - if isinstance(agent_name, str): - platform_formatted[override_key][agent_key] = shared['non_project_agents'][agent_name] - - platform_formatted["extra_utr_flags"] = [] if not platform_meta.get("extra_utr_flags") else platform_meta.get("extra_utr_flags") - platform_formatted["extra_utr_flags_build"] = [] if not platform_meta.get("extra_utr_flags_build") else platform_meta.get("extra_utr_flags_build") - - formatted_platforms.append(platform_formatted) - return formatted_platforms - - - -def _unfold_test_platforms(metafile, shared, root_keys=[]): - '''Retrieves test platform details from shared metafile, corresponding to the specific metafile. - Returns the new 'test_platforms' section.''' - - def replace_test_platforms(target_dict): - test_platforms = [] - for tp in target_dict.get("test_platforms", []): - tp["name"] = tp["type"] if not tp.get("name") else tp.get("name") - tp["is_performance"] = False if not tp.get("is_performance") else tp.get("is_performance") - tp["extra_utr_flags"] = [] if not tp.get("extra_utr_flags") else tp.get("extra_utr_flags") - - if tp["type"].lower()=="standalone": - tp["extra_utr_flags_build"] = [] if not tp.get("extra_utr_flags_build") else tp.get("extra_utr_flags_build") - test_platforms.append(tp) - target_dict['test_platforms'] = test_platforms - return target_dict + # get the matching test platform from shared metafile and + # concatenate utr_flags and utr_flags_build for this test platform from shared.metafile + project.metafile + shared_tp = [t for t in shared["test_platforms"] if t["type"].lower() == tp["type"].lower()][0] + tp["utr_flags"] = shared_tp["utr_flags"] + tp["utr_flags"] + if tp["type"].lower()=="standalone": + tp["utr_flags_build"] = shared_tp.get("utr_flags_build",[]) + tp.get("utr_flags_build",[]) - # replace all test platforms found directly under root of metafile - metafile = replace_test_platforms(metafile) - # replace any additional test platforms found under other specified keys - for root_key in root_keys: - metafile[root_key] = replace_test_platforms(metafile[root_key]) - + # updating the testplatform done, append it to metafile + test_platforms.append(tp) + + metafile['test_platforms'] = test_platforms return metafile \ No newline at end of file diff --git a/.yamato/shadergraph-linux-openglcore.yml b/.yamato/shadergraph-linux-openglcore.yml index 17ee5035a5f..462e4a919a9 100644 --- a/.yamato/shadergraph-linux-openglcore.yml +++ b/.yamato/shadergraph-linux-openglcore.yml @@ -17,7 +17,7 @@ ShaderGraph_Linux_OpenGLCore_playmode_mono_apiNet2_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -37,7 +37,7 @@ ShaderGraph_Linux_OpenGLCore_editmode_mono_apiNet2_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testproject=. artifacts: logs: paths: @@ -58,7 +58,7 @@ ShaderGraph_Linux_OpenGLCore_playmode_mono_apiNet2_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -82,7 +82,7 @@ ShaderGraph_Linux_OpenGLCore_editmode_mono_apiNet2_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-glcore" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testproject=. artifacts: logs: paths: diff --git a/.yamato/shadergraph-linux-vulkan.yml b/.yamato/shadergraph-linux-vulkan.yml index ad48c6484d1..f9aa38b387b 100644 --- a/.yamato/shadergraph-linux-vulkan.yml +++ b/.yamato/shadergraph-linux-vulkan.yml @@ -14,7 +14,7 @@ ShaderGraph_Linux_Vulkan_Standalone_mono_apiNet2_Linear_trunk: commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - - cd TestProjects/ShaderGraph && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --timeout=1200 + - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --scripting-backend=Mono2x --suite=playmode --timeout=1200 artifacts: logs: paths: @@ -37,7 +37,7 @@ Build_ShaderGraph_Linux_Vulkan_Player_mono_apiNet2_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --extra-editor-arg="-playergraphicsapi=Vulkan" --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testproject=. --timeout=1200 artifacts: logs: paths: @@ -60,7 +60,7 @@ ShaderGraph_Linux_Vulkan_playmode_mono_apiNet2_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -80,7 +80,7 @@ ShaderGraph_Linux_Vulkan_editmode_mono_apiNet2_Linear_trunk: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testproject=. artifacts: logs: paths: @@ -98,7 +98,7 @@ ShaderGraph_Linux_Vulkan_Standalone_mono_apiNet2_Linear_CUSTOM-REVISION: commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - - cd TestProjects/ShaderGraph && ./utr --suite=playmode --platform=StandaloneLinux64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --timeout=1200 + - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --extra-editor-arg="-colorspace=Linear" --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --scripting-backend=Mono2x --suite=playmode --timeout=1200 artifacts: logs: paths: @@ -124,7 +124,7 @@ Build_ShaderGraph_Linux_Vulkan_Player_mono_apiNet2_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --extra-editor-arg="-playergraphicsapi=Vulkan" --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=../../players --scripting-backend=Mono2x --suite=playmode --testproject=. --timeout=1200 artifacts: logs: paths: @@ -151,7 +151,7 @@ ShaderGraph_Linux_Vulkan_playmode_mono_apiNet2_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -175,7 +175,7 @@ ShaderGraph_Linux_Vulkan_editmode_mono_apiNet2_Linear_CUSTOM-REVISION: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/ShaderGraph/utr - chmod +x TestProjects/ShaderGraph/utr - cd TestProjects/ShaderGraph && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan" + - cd TestProjects/ShaderGraph && DISPLAY=:0.0 ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testproject=. artifacts: logs: paths: diff --git a/.yamato/shadergraph-osx-metal.yml b/.yamato/shadergraph-osx-metal.yml index 7e04f772499..bd99098b5eb 100644 --- a/.yamato/shadergraph-osx-metal.yml +++ b/.yamato/shadergraph-osx-metal.yml @@ -20,7 +20,7 @@ ShaderGraph_OSX_Metal_Standalone_mono_apiNet2_Linear_trunk: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -47,7 +47,7 @@ ShaderGraph_OSX_Metal_playmode_mono_apiNet2_Linear_trunk: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -75,7 +75,7 @@ ShaderGraph_OSX_Metal_Standalone_mono_apiNet2_Linear_CUSTOM-REVISION: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --platform=StandaloneOSX --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --timeout=2400" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=StandaloneOSX --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --timeout=2400" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ @@ -106,7 +106,7 @@ ShaderGraph_OSX_Metal_playmode_mono_apiNet2_Linear_CUSTOM-REVISION: - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(/usr/local/bin/python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only' - |5- - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2" + ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph" UTR_RESULT=$? mkdir -p TestProjects/ShaderGraph/test-results/ scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/ diff --git a/.yamato/shadergraph-osx-openglcore.yml b/.yamato/shadergraph-osx-openglcore.yml index 886806f6bdb..525979bb5ea 100644 --- a/.yamato/shadergraph-osx-openglcore.yml +++ b/.yamato/shadergraph-osx-openglcore.yml @@ -16,7 +16,7 @@ ShaderGraph_OSX_OpenGLCore_playmode_mono_apiNet2_Linear_trunk: - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 + - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -35,7 +35,7 @@ ShaderGraph_OSX_OpenGLCore_editmode_mono_apiNet2_Linear_trunk: - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 + - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testproject=. artifacts: logs: paths: @@ -55,7 +55,7 @@ ShaderGraph_OSX_OpenGLCore_playmode_mono_apiNet2_Linear_CUSTOM-REVISION: - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 + - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=. artifacts: logs: paths: @@ -78,7 +78,7 @@ ShaderGraph_OSX_OpenGLCore_editmode_mono_apiNet2_Linear_CUSTOM-REVISION: - chmod +x TestProjects/ShaderGraph/utr - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - cd TestProjects/ShaderGraph && unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp --wait --published-only - - cd TestProjects/ShaderGraph && ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 + - cd TestProjects/ShaderGraph && ./utr --artifacts_path=test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --reruncount=2 --scripting-backend=Mono2x --suite=editor --testproject=. artifacts: logs: paths: diff --git a/.yamato/shadergraph-win-dx11.yml b/.yamato/shadergraph-win-dx11.yml index 3b1d8e41193..1f78a4bd3c5 100644 --- a/.yamato/shadergraph-win-dx11.yml +++ b/.yamato/shadergraph-win-dx11.yml @@ -13,7 +13,7 @@ ShaderGraph_Win_DX11_Standalone_mono_apiNet2_Linear_trunk: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates commands: - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output TestProjects/ShaderGraph/utr.bat - - cd TestProjects/ShaderGraph && utr --suite=playmode --platform=StandaloneWindows64 --artifacts_path=test-results --player-load-path=../../players --player-connection-ip=auto --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --timeout=1200 + - cd TestProjects/ShaderGraph && utr --artifacts_path=test-results --extra-editor-arg="-colorspace=Linear" --platform=StandaloneWindows64 --player-connection-ip=auto --player-load-path=../../players --reruncount=2 --scripting-backend=Mono2x --suite=playmode --timeout=1200 artifacts: logs: paths: @@ -40,7 +40,7 @@ Build_ShaderGraph_Win_DX11_Player_mono_apiNet2_Linear_trunk: set /p GIT_REVISIONDATE=