Skip to content

Commit

Permalink
Add ShaderGraph_BuiltIn editmode jobs (#7278)
Browse files Browse the repository at this point in the history
* add ShaderGraph_BuiltIn editmode

* Revert "add ShaderGraph_BuiltIn editmode"

This reverts commit fe28328.

* Update shadergraph_builtin_foundation.metafile

* yaml-generation builtin_editmode

* Turn off filter mode

* Turn off PVR filtering mode

* Update 042_Lighting_Scene_VertexLightingSettings.lighting

Co-authored-by: Sophia <sophia@unity3d.com>
  • Loading branch information
varticcata and Sophia authored Mar 1, 2022
1 parent 85680b4 commit d6d7f30
Show file tree
Hide file tree
Showing 17 changed files with 933 additions and 5 deletions.
16 changes: 16 additions & 0 deletions .yamato/all-shadergraph_builtin_foundation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,20 @@ PR_ShaderGraph_BuiltIn_Foundation_trunk:
dependencies:
- path: .yamato/shadergraph_builtin_foundation-win-dx11.yml#ShaderGraph_BuiltIn_Foundation_Win_DX11_playmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-win-dx11.yml#ShaderGraph_BuiltIn_Foundation_Win_DX11_editmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-osx-openglcore.yml#ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-osx-openglcore.yml#ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_editmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-linux-vulkan.yml#ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-linux-vulkan.yml#ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_editmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-osx-metal.yml#ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-osx-metal.yml#ShaderGraph_BuiltIn_Foundation_OSX_Metal_editmode_mono_Linear_trunk
rerun: on_new_revision
Extra_ShaderGraph_BuiltIn_Foundation_trunk:
name: Extra ShaderGraph_BuiltIn_Foundation on trunk
variables:
Expand Down Expand Up @@ -53,12 +61,20 @@ PR_ShaderGraph_BuiltIn_Foundation_CUSTOM-REVISION:
dependencies:
- path: .yamato/shadergraph_builtin_foundation-win-dx11.yml#ShaderGraph_BuiltIn_Foundation_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-win-dx11.yml#ShaderGraph_BuiltIn_Foundation_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-osx-openglcore.yml#ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-osx-openglcore.yml#ShaderGraph_BuiltIn_Foundation_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-linux-vulkan.yml#ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-linux-vulkan.yml#ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-osx-metal.yml#ShaderGraph_BuiltIn_Foundation_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_foundation-osx-metal.yml#ShaderGraph_BuiltIn_Foundation_OSX_Metal_editmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
Extra_ShaderGraph_BuiltIn_Foundation_CUSTOM-REVISION:
name: Extra ShaderGraph_BuiltIn_Foundation on CUSTOM-REVISION
variables:
Expand Down
16 changes: 16 additions & 0 deletions .yamato/all-shadergraph_builtin_lighting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,20 @@ PR_ShaderGraph_BuiltIn_Lighting_trunk:
dependencies:
- path: .yamato/shadergraph_builtin_lighting-win-dx11.yml#ShaderGraph_BuiltIn_Lighting_Win_DX11_playmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-win-dx11.yml#ShaderGraph_BuiltIn_Lighting_Win_DX11_editmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-osx-openglcore.yml#ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-osx-openglcore.yml#ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_editmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-linux-vulkan.yml#ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-linux-vulkan.yml#ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_editmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-osx-metal.yml#ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_trunk
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-osx-metal.yml#ShaderGraph_BuiltIn_Lighting_OSX_Metal_editmode_mono_Linear_trunk
rerun: on_new_revision
Extra_ShaderGraph_BuiltIn_Lighting_trunk:
name: Extra ShaderGraph_BuiltIn_Lighting on trunk
variables:
Expand Down Expand Up @@ -53,12 +61,20 @@ PR_ShaderGraph_BuiltIn_Lighting_CUSTOM-REVISION:
dependencies:
- path: .yamato/shadergraph_builtin_lighting-win-dx11.yml#ShaderGraph_BuiltIn_Lighting_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-win-dx11.yml#ShaderGraph_BuiltIn_Lighting_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-osx-openglcore.yml#ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-osx-openglcore.yml#ShaderGraph_BuiltIn_Lighting_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-linux-vulkan.yml#ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-linux-vulkan.yml#ShaderGraph_BuiltIn_Lighting_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-osx-metal.yml#ShaderGraph_BuiltIn_Lighting_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
- path: .yamato/shadergraph_builtin_lighting-osx-metal.yml#ShaderGraph_BuiltIn_Lighting_OSX_Metal_editmode_mono_Linear_CUSTOM-REVISION
rerun: on_new_revision
Extra_ShaderGraph_BuiltIn_Lighting_CUSTOM-REVISION:
name: Extra ShaderGraph_BuiltIn_Lighting on CUSTOM-REVISION
variables:
Expand Down
8 changes: 6 additions & 2 deletions .yamato/config/shadergraph_builtin_foundation.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ project:
folder: BuiltInGraphicsTest_Foundation
test_platforms:
- type: playmode
- type: editmode

platforms:
- name: Win
Expand Down Expand Up @@ -47,27 +48,30 @@ jobs:
color_space: Linear
test_platforms:
- playmode
- editmode
- platform: OSX
api: OpenGLCore
build_config: mono
color_space: Linear
test_platforms:
- playmode
- editmode
- platform: Linux
api: Vulkan
build_config: mono
color_space: Linear
test_platforms:
- playmode
- editmode
- platform: OSX
api: Metal
build_config: mono
color_space: Linear
test_platforms:
- playmode
- editmode
- name: Extra <PROJECT_NAME>
dependencies:
[]
dependencies: []
- name: <PROJECT_NAME>
dependencies:
- <PROJECT_ALL_YML_FILE>#PR_<PROJECT_NAME>_<TRACK>
Expand Down
8 changes: 6 additions & 2 deletions .yamato/config/shadergraph_builtin_lighting.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ project:
folder: BuiltInGraphicsTest_Lighting
test_platforms:
- type: playmode
- type: editmode

platforms:
- name: Win
Expand Down Expand Up @@ -47,27 +48,30 @@ jobs:
color_space: Linear
test_platforms:
- playmode
- editmode
- platform: OSX
api: OpenGLCore
build_config: mono
color_space: Linear
test_platforms:
- playmode
- editmode
- platform: Linux
api: Vulkan
build_config: mono
color_space: Linear
test_platforms:
- playmode
- editmode
- platform: OSX
api: Metal
build_config: mono
color_space: Linear
test_platforms:
- playmode
- editmode
- name: Extra <PROJECT_NAME>
dependencies:
[]
dependencies: []
- name: <PROJECT_NAME>
dependencies:
- <PROJECT_ALL_YML_FILE>#PR_<PROJECT_NAME>_<TRACK>
Expand Down
76 changes: 76 additions & 0 deletions .yamato/shadergraph_builtin_foundation-linux-openglcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,44 @@ ShaderGraph_BuiltIn_Foundation_Linux_OpenGLCore_playmode_mono_Linear_trunk:
dependencies:
- path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux
rerun: on_new_revision
ShaderGraph_BuiltIn_Foundation_Linux_OpenGLCore_editmode_mono_Linear_trunk:
name: ShaderGraph_BuiltIn_Foundation on Linux_OpenGLCore_editmode_mono_Linear on version trunk
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
CUSTOM_REVISION: '{{trunk.changeset.id}}'
CACHE_ARGS: '{{cache.flags}}'
UTR_VERSION: "current"
TEST_FILTER: .*
commands:
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
retries: 2
- command: chmod +x utr
- command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
- command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
- command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
- command: sudo apt update
- command: sudo apt install unity-downloader-cli
retries: 2
- command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
retries: 2
- command: |5-
export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI`
DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation
after:
- command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0
- command: find_instabilities || exit 0
artifacts:
logs:
paths:
- "**/test-results/**"
- "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log"
dependencies:
- path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux
rerun: on_new_revision
ShaderGraph_BuiltIn_Foundation_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION:
name: ShaderGraph_BuiltIn_Foundation on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION
agent:
Expand Down Expand Up @@ -83,3 +121,41 @@ ShaderGraph_BuiltIn_Foundation_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVI
dependencies:
- path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux
rerun: on_new_revision
ShaderGraph_BuiltIn_Foundation_Linux_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION:
name: ShaderGraph_BuiltIn_Foundation on Linux_OpenGLCore_editmode_mono_Linear on version CUSTOM-REVISION
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
CUSTOM_REVISION: custom_revision_not_set
CACHE_ARGS: '{{cache.flags}}'
UTR_VERSION: "current"
TEST_FILTER: .*
commands:
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
retries: 2
- command: chmod +x utr
- command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
- command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
- command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
- command: sudo apt update
- command: sudo apt install unity-downloader-cli
retries: 2
- command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
retries: 2
- command: |5-
export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI`
DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation
after:
- command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0
- command: find_instabilities || exit 0
artifacts:
logs:
paths:
- "**/test-results/**"
- "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log"
dependencies:
- path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux
rerun: on_new_revision
76 changes: 76 additions & 0 deletions .yamato/shadergraph_builtin_foundation-linux-vulkan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,44 @@ ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_trunk:
dependencies:
- path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux
rerun: on_new_revision
ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_editmode_mono_Linear_trunk:
name: ShaderGraph_BuiltIn_Foundation on Linux_Vulkan_editmode_mono_Linear on version trunk
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
CUSTOM_REVISION: '{{trunk.changeset.id}}'
CACHE_ARGS: '{{cache.flags}}'
UTR_VERSION: "current"
TEST_FILTER: .*
commands:
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
retries: 2
- command: chmod +x utr
- command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
- command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
- command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
- command: sudo apt update
- command: sudo apt install unity-downloader-cli
retries: 2
- command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
retries: 2
- command: |5-
export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI`
DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation
after:
- command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0
- command: find_instabilities || exit 0
artifacts:
logs:
paths:
- "**/test-results/**"
- "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log"
dependencies:
- path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux
rerun: on_new_revision
ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION:
name: ShaderGraph_BuiltIn_Foundation on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION
agent:
Expand Down Expand Up @@ -83,3 +121,41 @@ ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION
dependencies:
- path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux
rerun: on_new_revision
ShaderGraph_BuiltIn_Foundation_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION:
name: ShaderGraph_BuiltIn_Foundation on Linux_Vulkan_editmode_mono_Linear on version CUSTOM-REVISION
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
flavor: b1.large
variables:
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
CUSTOM_REVISION: custom_revision_not_set
CACHE_ARGS: '{{cache.flags}}'
UTR_VERSION: "current"
TEST_FILTER: .*
commands:
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
retries: 2
- command: chmod +x utr
- command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
- command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
- command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
- command: sudo apt update
- command: sudo apt install unity-downloader-cli
retries: 2
- command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
retries: 2
- command: |5-
export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI`
DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BuiltInGraphicsTest_Foundation/test-results --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=./TestProjects/BuiltInGraphicsTest_Foundation
after:
- command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0
- command: find_instabilities || exit 0
artifacts:
logs:
paths:
- "**/test-results/**"
- "TestProjects/BuiltInGraphicsTest_Foundation/Logs/*.log"
dependencies:
- path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux
rerun: on_new_revision
Loading

0 comments on commit d6d7f30

Please sign in to comment.