diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ffff67805ab..65ad141234e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,10 +1,5 @@ -# **Please read;** -## **PR Workflow for the Graphics repository:** -* **All PRs must be opened as draft initially** -* Reviewers can be added while the PR is still in draft -* The PR can be marked as “Ready for Review” once the reviewers have confirmed that **no more changes are needed** -* Tests will start automatically after the PR is marked as “Ready for Review” -* **Do not use [skip ci]** - this can break some of our tooling +# **Please read the [Contributing guide](CONTRIBUTING.md) before making a PR.** + * Read the [Graphics repository & Yamato FAQ](http://go/graphics-yamato-faq). ### Checklist for PR maker diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml index 17898670474..9dd9ee8d412 100644 --- a/.yamato/_abv.yml +++ b/.yamato/_abv.yml @@ -8,56 +8,34 @@ --- all_project_ci_trunk: - name: _ABV for SRP repository - trunk + name: _ABV for SRP repository (all PR jobs) - trunk dependencies: - path: .yamato/_projectcontext.yml#all_package_ci_project_trunk rerun: on-new-revision - - path: .yamato/all-universal.yml#All_Universal_trunk + - path: .yamato/all-universal.yml#PR_Universal_trunk rerun: on-new-revision - - path: .yamato/all-shadergraph.yml#All_ShaderGraph_trunk + - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_trunk rerun: on-new-revision - - path: .yamato/all-hdrp.yml#All_HDRP_trunk + - path: .yamato/all-hdrp.yml#PR_HDRP_trunk rerun: on-new-revision - - path: .yamato/all-vfx_hdrp.yml#All_VFX_HDRP_trunk + - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_trunk rerun: on-new-revision - - path: .yamato/all-vfx_urp.yml#All_VFX_URP_trunk + - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_trunk rerun: on-new-revision all_project_ci_nightly_trunk: name: _Nightly ABV against trunk dependencies: - - path: .yamato/_abv.yml#all_project_ci_trunk - rerun: on-new-revision - - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk - rerun: on-new-revision - - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_trunk - rerun: on-new-revision - - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_trunk - rerun: on-new-revision - - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_XR_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_editmode_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_playmode_mono_Linear_trunk + - path: .yamato/_projectcontext.yml#all_package_ci_project_trunk rerun: on-new-revision - - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_Linear_trunk + - path: .yamato/all-universal.yml#Nightly_Universal_trunk rerun: on-new-revision - - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_playmode_mono_Linear_trunk + - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_trunk rerun: on-new-revision - - path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_editmode_mono_Linear_trunk + - path: .yamato/all-hdrp.yml#Nightly_HDRP_trunk rerun: on-new-revision - - path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_playmode_mono_Linear_trunk + - path: .yamato/all-vfx_hdrp.yml#Nightly_VFX_HDRP_trunk rerun: on-new-revision - - path: .yamato/all-urp_performance_boatattack.yml#All_URP_Performance_BoatAttack_trunk + - path: .yamato/all-vfx_urp.yml#Nightly_VFX_URP_trunk rerun: on-new-revision triggers: recurring: @@ -92,19 +70,19 @@ trunk_verification_trunk: - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_trunk rerun: on-new-revision all_project_ci_CUSTOM-REVISION: - name: _ABV for SRP repository - CUSTOM-REVISION + name: _ABV for SRP repository (all PR jobs) - CUSTOM-REVISION dependencies: - path: .yamato/_projectcontext.yml#all_package_ci_project_CUSTOM-REVISION rerun: always - - path: .yamato/all-universal.yml#All_Universal_CUSTOM-REVISION + - path: .yamato/all-universal.yml#PR_Universal_CUSTOM-REVISION rerun: always - - path: .yamato/all-shadergraph.yml#All_ShaderGraph_CUSTOM-REVISION + - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_CUSTOM-REVISION rerun: always - - path: .yamato/all-hdrp.yml#All_HDRP_CUSTOM-REVISION + - path: .yamato/all-hdrp.yml#PR_HDRP_CUSTOM-REVISION rerun: always - - path: .yamato/all-vfx_hdrp.yml#All_VFX_HDRP_CUSTOM-REVISION + - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_CUSTOM-REVISION rerun: always - - path: .yamato/all-vfx_urp.yml#All_VFX_URP_CUSTOM-REVISION + - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/_projectcontext.yml b/.yamato/_projectcontext.yml index 2e39b702110..dd4e96f9aa3 100644 --- a/.yamato/_projectcontext.yml +++ b/.yamato/_projectcontext.yml @@ -379,6 +379,8 @@ all_package_ci_project_trunk: - .yamato/_projectcontext.yml#test_all_project_windows_min_editor - .yamato/_projectcontext.yml#test_all_project_macos_trunk - .yamato/_projectcontext.yml#test_all_project_macos_min_editor + triggers: + expression: push.branch eq "master" AND NOT pull_request.draft commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t @@ -394,6 +396,8 @@ all_package_ci_project_CUSTOM-REVISION: - .yamato/_projectcontext.yml#test_all_project_macos_CUSTOM-REVISION variables: CUSTOM_REVISION: custom_revision_not_set + triggers: + expression: push.branch eq "master" AND NOT pull_request.draft commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci package izon -t diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index 3b84ac1b343..03521aeedc2 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -7,84 +7,112 @@ --- -All_HDRP_trunk: - name: All HDRP CI - trunk +PR_HDRP_trunk: + name: HDRP PR Job - trunk dependencies: - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_trunk + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_mono_Linear_trunk rerun: on-new-revision - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_trunk rerun: on-new-revision - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_mono_Linear_trunk + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_mono_Linear_trunk - rerun: on-new-revision - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_mono_Linear_trunk - rerun: on-new-revision - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_playmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_editmode_mono_Linear_trunk + - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_mono_Linear_trunk rerun: on-new-revision - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_playmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_mono_Linear_trunk - rerun: on-new-revision - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_mono_Linear_trunk + - path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_trunk rerun: on-new-revision - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_mono_Linear_trunk + - path: .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_trunk rerun: on-new-revision - - path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_trunk + - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_trunk rerun: on-new-revision + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"] variables: UTR_VERSION: "current" TEST_FILTER: .* -All_HDRP_CUSTOM-REVISION: - name: All HDRP CI - CUSTOM-REVISION +Nightly_HDRP_trunk: + name: Nightly HDRP - trunk dependencies: - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/all-hdrp.yml#PR_HDRP_trunk + rerun: on-new-revision + - path: .yamato/all-hdrp_dxr.yml#Nightly_HDRP_DXR_trunk + rerun: on-new-revision + - path: .yamato/all-hdrp_hybrid.yml#Nightly_HDRP_Hybrid_trunk + rerun: on-new-revision + - path: .yamato/all-vfx_hdrp.yml#Nightly_VFX_HDRP_trunk + rerun: on-new-revision + - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_editmode_mono_Linear_trunk + rerun: on-new-revision +PR_HDRP_CUSTOM-REVISION: + name: HDRP PR Job - CUSTOM-REVISION + dependencies: + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION - rerun: always - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION - rerun: always - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION - rerun: always - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION - rerun: always - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION - rerun: always - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION + - path: .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_CUSTOM-REVISION rerun: always - - path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_CUSTOM-REVISION + - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_CUSTOM-REVISION rerun: always + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"] variables: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* +Nightly_HDRP_CUSTOM-REVISION: + name: Nightly HDRP - CUSTOM-REVISION + dependencies: + - path: .yamato/all-hdrp.yml#PR_HDRP_CUSTOM-REVISION + rerun: always + - path: .yamato/all-hdrp_dxr.yml#Nightly_HDRP_DXR_CUSTOM-REVISION + rerun: always + - path: .yamato/all-hdrp_hybrid.yml#Nightly_HDRP_Hybrid_CUSTOM-REVISION + rerun: always + - path: .yamato/all-vfx_hdrp.yml#Nightly_VFX_HDRP_CUSTOM-REVISION + rerun: always + - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-hdrp_dxr.yml b/.yamato/all-hdrp_dxr.yml index 6821604bd3b..a09964b4270 100644 --- a/.yamato/all-hdrp_dxr.yml +++ b/.yamato/all-hdrp_dxr.yml @@ -7,28 +7,40 @@ --- -All_HDRP_DXR_trunk: - name: All HDRP_DXR CI - trunk +PR_HDRP_DXR_trunk: + name: HDRP_DXR PR Job - trunk dependencies: - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_Standalone_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_mono_Linear_trunk + variables: + UTR_VERSION: "current" + TEST_FILTER: .* +Nightly_HDRP_DXR_trunk: + name: Nightly HDRP_DXR - trunk + dependencies: + - path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_trunk rerun: on-new-revision - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_mono_Linear_trunk rerun: on-new-revision + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_mono_Linear_trunk + rerun: on-new-revision +PR_HDRP_DXR_CUSTOM-REVISION: + name: HDRP_DXR PR Job - CUSTOM-REVISION + dependencies: + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always variables: + CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* -All_HDRP_DXR_CUSTOM-REVISION: - name: All HDRP_DXR CI - CUSTOM-REVISION +Nightly_HDRP_DXR_CUSTOM-REVISION: + name: Nightly HDRP_DXR - CUSTOM-REVISION dependencies: - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION - rerun: always - - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_CUSTOM-REVISION rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_mono_Linear_CUSTOM-REVISION + rerun: always variables: CUSTOM_REVISION: custom_revision_not_set - UTR_VERSION: "current" - TEST_FILTER: .* diff --git a/.yamato/all-hdrp_hybrid.yml b/.yamato/all-hdrp_hybrid.yml index b4d271fc3f9..85009470e68 100644 --- a/.yamato/all-hdrp_hybrid.yml +++ b/.yamato/all-hdrp_hybrid.yml @@ -7,24 +7,40 @@ --- -All_HDRP_Hybrid_trunk: - name: All HDRP_Hybrid CI - trunk +PR_HDRP_Hybrid_trunk: + name: HDRP_Hybrid PR Job - trunk dependencies: - - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_mono_Linear_trunk + - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_trunk rerun: on-new-revision + variables: + UTR_VERSION: "current" + TEST_FILTER: .* +Nightly_HDRP_Hybrid_trunk: + name: Nightly HDRP_Hybrid - trunk + dependencies: - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_mono_Linear_trunk rerun: on-new-revision + - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_trunk + rerun: on-new-revision +PR_HDRP_Hybrid_CUSTOM-REVISION: + name: HDRP_Hybrid PR Job - CUSTOM-REVISION + dependencies: + - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always variables: + CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* -All_HDRP_Hybrid_CUSTOM-REVISION: - name: All HDRP_Hybrid CI - CUSTOM-REVISION +Nightly_HDRP_Hybrid_CUSTOM-REVISION: + name: Nightly HDRP_Hybrid - CUSTOM-REVISION dependencies: + - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION + rerun: always - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION + - path: .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set - UTR_VERSION: "current" - TEST_FILTER: .* diff --git a/.yamato/all-shadergraph.yml b/.yamato/all-shadergraph.yml index 87edeb5fc22..12a5a16ac20 100644 --- a/.yamato/all-shadergraph.yml +++ b/.yamato/all-shadergraph.yml @@ -7,36 +7,80 @@ --- -All_ShaderGraph_trunk: - name: All ShaderGraph CI - trunk +PR_ShaderGraph_trunk: + name: ShaderGraph PR Job - trunk dependencies: - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_Standalone_mono_Linear_trunk rerun: on-new-revision + - path: .yamato/shadergraph-osx-openglcore.yml#ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/shadergraph-osx-metal.yml#ShaderGraph_OSX_Metal_playmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/shadergraph-iphone-metal.yml#ShaderGraph_iPhone_Metal_Standalone_il2cpp_Linear_trunk + rerun: on-new-revision + - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_trunk + rerun: on-new-revision + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"] + variables: + UTR_VERSION: "current" + TEST_FILTER: .* +Nightly_ShaderGraph_trunk: + name: Nightly ShaderGraph - trunk + dependencies: + - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_trunk + rerun: on-new-revision + - path: .yamato/all-shadergraph_stereo.yml#Nightly_ShaderGraph_Stereo_trunk + rerun: on-new-revision - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/shadergraph-osx-openglcore.yml#ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_trunk + - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_editmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_playmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/all-shadergraph_stereo.yml#All_ShaderGraph_Stereo_trunk + - path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_trunk rerun: on-new-revision +PR_ShaderGraph_CUSTOM-REVISION: + name: ShaderGraph PR Job - CUSTOM-REVISION + dependencies: + - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/shadergraph-osx-openglcore.yml#ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/shadergraph-osx-metal.yml#ShaderGraph_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/shadergraph-iphone-metal.yml#ShaderGraph_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_CUSTOM-REVISION + rerun: always + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"] variables: + CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* -All_ShaderGraph_CUSTOM-REVISION: - name: All ShaderGraph CI - CUSTOM-REVISION +Nightly_ShaderGraph_CUSTOM-REVISION: + name: Nightly ShaderGraph - CUSTOM-REVISION dependencies: - - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_CUSTOM-REVISION + rerun: always + - path: .yamato/all-shadergraph_stereo.yml#Nightly_ShaderGraph_Stereo_CUSTOM-REVISION rerun: always - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/shadergraph-osx-openglcore.yml#ShaderGraph_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/all-shadergraph_stereo.yml#All_ShaderGraph_Stereo_CUSTOM-REVISION + - path: .yamato/shadergraph-linux-vulkan.yml#ShaderGraph_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set - UTR_VERSION: "current" - TEST_FILTER: .* diff --git a/.yamato/all-shadergraph_stereo.yml b/.yamato/all-shadergraph_stereo.yml index 222a49819bc..93919d4dd73 100644 --- a/.yamato/all-shadergraph_stereo.yml +++ b/.yamato/all-shadergraph_stereo.yml @@ -7,8 +7,8 @@ --- -All_ShaderGraph_Stereo_trunk: - name: All ShaderGraph_Stereo CI - trunk +PR_ShaderGraph_Stereo_trunk: + name: ShaderGraph_Stereo PR Job - trunk dependencies: - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_Standalone_mono_Linear_trunk rerun: on-new-revision @@ -17,8 +17,13 @@ All_ShaderGraph_Stereo_trunk: variables: UTR_VERSION: "current" TEST_FILTER: .* -All_ShaderGraph_Stereo_CUSTOM-REVISION: - name: All ShaderGraph_Stereo CI - CUSTOM-REVISION +Nightly_ShaderGraph_Stereo_trunk: + name: Nightly ShaderGraph_Stereo - trunk + dependencies: + - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_trunk + rerun: on-new-revision +PR_ShaderGraph_Stereo_CUSTOM-REVISION: + name: ShaderGraph_Stereo PR Job - CUSTOM-REVISION dependencies: - path: .yamato/shadergraph_stereo-win.yml#ShaderGraph_Stereo_Win_Standalone_mono_Linear_CUSTOM-REVISION rerun: always @@ -28,3 +33,10 @@ All_ShaderGraph_Stereo_CUSTOM-REVISION: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* +Nightly_ShaderGraph_Stereo_CUSTOM-REVISION: + name: Nightly ShaderGraph_Stereo - CUSTOM-REVISION + dependencies: + - path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-smoke_test.yml b/.yamato/all-smoke_test.yml index 73b213cb3ba..8ef050c12fe 100644 --- a/.yamato/all-smoke_test.yml +++ b/.yamato/all-smoke_test.yml @@ -7,8 +7,8 @@ --- -All_Smoke_Test_trunk: - name: All Smoke_Test CI - trunk +PR_Smoke_Test_trunk: + name: Smoke_Test PR Job - trunk dependencies: - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_mono_Linear_trunk rerun: on-new-revision @@ -19,8 +19,13 @@ All_Smoke_Test_trunk: variables: UTR_VERSION: "current" TEST_FILTER: .* -All_Smoke_Test_CUSTOM-REVISION: - name: All Smoke_Test CI - CUSTOM-REVISION +Nightly_Smoke_Test_trunk: + name: Nightly Smoke_Test - trunk + dependencies: + - path: .yamato/all-smoke_test.yml#PR_Smoke_Test_trunk + rerun: on-new-revision +PR_Smoke_Test_CUSTOM-REVISION: + name: Smoke_Test PR Job - CUSTOM-REVISION dependencies: - path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION rerun: always @@ -32,3 +37,10 @@ All_Smoke_Test_CUSTOM-REVISION: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* +Nightly_Smoke_Test_CUSTOM-REVISION: + name: Nightly Smoke_Test - CUSTOM-REVISION + dependencies: + - path: .yamato/all-smoke_test.yml#PR_Smoke_Test_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-universal.yml b/.yamato/all-universal.yml index a08c16cd89e..87658410f77 100644 --- a/.yamato/all-universal.yml +++ b/.yamato/all-universal.yml @@ -7,16 +7,26 @@ --- -All_Universal_trunk: - name: All Universal CI - trunk +PR_Universal_trunk: + name: Universal PR Job - trunk dependencies: - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_mono_Linear_trunk rerun: on-new-revision + - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_mono_Linear_trunk + rerun: on-new-revision - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_Linear_trunk + - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_mono_Linear_trunk + - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_Standalone_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_Standalone_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk + rerun: on-new-revision + - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_trunk + rerun: on-new-revision + - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_trunk rerun: on-new-revision - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_mono_Linear_trunk rerun: on-new-revision @@ -28,23 +38,64 @@ All_Universal_trunk: rerun: on-new-revision - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_trunk rerun: on-new-revision - - path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_trunk + - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_trunk rerun: on-new-revision - - path: .yamato/all-universal_hybrid.yml#All_Universal_Hybrid_trunk + - path: .yamato/all-universal_hybrid.yml#PR_Universal_Hybrid_trunk rerun: on-new-revision + - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_trunk + rerun: on-new-revision + - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_trunk + rerun: on-new-revision + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"] variables: UTR_VERSION: "current" TEST_FILTER: .* -All_Universal_CUSTOM-REVISION: - name: All Universal CI - CUSTOM-REVISION +Nightly_Universal_trunk: + name: Nightly Universal - trunk + dependencies: + - path: .yamato/all-universal.yml#PR_Universal_trunk + rerun: on-new-revision + - path: .yamato/all-universal_stereo.yml#Nightly_Universal_Stereo_trunk + rerun: on-new-revision + - path: .yamato/all-universal_hybrid.yml#Nightly_Universal_Hybrid_trunk + rerun: on-new-revision + - path: .yamato/all-vfx_urp.yml#Nightly_VFX_URP_trunk + rerun: on-new-revision + - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_trunk + rerun: on-new-revision + - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_playmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_playmode_XR_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_XR_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_playmode_mono_Linear_trunk + rerun: on-new-revision +PR_Universal_CUSTOM-REVISION: + name: Universal PR Job - CUSTOM-REVISION dependencies: - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION rerun: always + - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION + rerun: always - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION + - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION + - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION rerun: always - path: .yamato/universal-osx-metal.yml#Universal_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION rerun: always @@ -56,11 +107,44 @@ All_Universal_CUSTOM-REVISION: rerun: always - path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/all-universal_stereo.yml#All_Universal_Stereo_CUSTOM-REVISION + - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_CUSTOM-REVISION + rerun: always + - path: .yamato/all-universal_hybrid.yml#PR_Universal_Hybrid_CUSTOM-REVISION rerun: always - - path: .yamato/all-universal_hybrid.yml#All_Universal_Hybrid_CUSTOM-REVISION + - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_CUSTOM-REVISION rerun: always + - path: .yamato/all-shadergraph.yml#PR_ShaderGraph_CUSTOM-REVISION + rerun: always + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"] variables: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* +Nightly_Universal_CUSTOM-REVISION: + name: Nightly Universal - CUSTOM-REVISION + dependencies: + - path: .yamato/all-universal.yml#PR_Universal_CUSTOM-REVISION + rerun: always + - path: .yamato/all-universal_stereo.yml#Nightly_Universal_Stereo_CUSTOM-REVISION + rerun: always + - path: .yamato/all-universal_hybrid.yml#Nightly_Universal_Hybrid_CUSTOM-REVISION + rerun: always + - path: .yamato/all-vfx_urp.yml#Nightly_VFX_URP_CUSTOM-REVISION + rerun: always + - path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-universal_hybrid.yml b/.yamato/all-universal_hybrid.yml index 08c8d3760cf..6beeeea13c6 100644 --- a/.yamato/all-universal_hybrid.yml +++ b/.yamato/all-universal_hybrid.yml @@ -7,8 +7,8 @@ --- -All_Universal_Hybrid_trunk: - name: All Universal_Hybrid CI - trunk +PR_Universal_Hybrid_trunk: + name: Universal_Hybrid PR Job - trunk dependencies: - path: .yamato/universal_hybrid-win-dx11.yml#Universal_Hybrid_Win_DX11_playmode_mono_Linear_trunk rerun: on-new-revision @@ -17,8 +17,13 @@ All_Universal_Hybrid_trunk: variables: UTR_VERSION: "current" TEST_FILTER: .* -All_Universal_Hybrid_CUSTOM-REVISION: - name: All Universal_Hybrid CI - CUSTOM-REVISION +Nightly_Universal_Hybrid_trunk: + name: Nightly Universal_Hybrid - trunk + dependencies: + - path: .yamato/all-universal_hybrid.yml#PR_Universal_Hybrid_trunk + rerun: on-new-revision +PR_Universal_Hybrid_CUSTOM-REVISION: + name: Universal_Hybrid PR Job - CUSTOM-REVISION dependencies: - path: .yamato/universal_hybrid-win-dx11.yml#Universal_Hybrid_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION rerun: always @@ -28,3 +33,10 @@ All_Universal_Hybrid_CUSTOM-REVISION: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* +Nightly_Universal_Hybrid_CUSTOM-REVISION: + name: Nightly Universal_Hybrid - CUSTOM-REVISION + dependencies: + - path: .yamato/all-universal_hybrid.yml#PR_Universal_Hybrid_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-universal_stereo.yml b/.yamato/all-universal_stereo.yml index ad6d4c96c8c..618d8b283d8 100644 --- a/.yamato/all-universal_stereo.yml +++ b/.yamato/all-universal_stereo.yml @@ -7,8 +7,8 @@ --- -All_Universal_Stereo_trunk: - name: All Universal_Stereo CI - trunk +PR_Universal_Stereo_trunk: + name: Universal_Stereo PR Job - trunk dependencies: - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_Standalone_mono_Linear_trunk rerun: on-new-revision @@ -17,8 +17,13 @@ All_Universal_Stereo_trunk: variables: UTR_VERSION: "current" TEST_FILTER: .* -All_Universal_Stereo_CUSTOM-REVISION: - name: All Universal_Stereo CI - CUSTOM-REVISION +Nightly_Universal_Stereo_trunk: + name: Nightly Universal_Stereo - trunk + dependencies: + - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_trunk + rerun: on-new-revision +PR_Universal_Stereo_CUSTOM-REVISION: + name: Universal_Stereo PR Job - CUSTOM-REVISION dependencies: - path: .yamato/universal_stereo-win.yml#Universal_Stereo_Win_Standalone_mono_Linear_CUSTOM-REVISION rerun: always @@ -28,3 +33,10 @@ All_Universal_Stereo_CUSTOM-REVISION: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* +Nightly_Universal_Stereo_CUSTOM-REVISION: + name: Nightly Universal_Stereo - CUSTOM-REVISION + dependencies: + - path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-urp_performance_boatattack.yml b/.yamato/all-urp_performance_boatattack.yml index 420334440bc..ea058c81ea5 100644 --- a/.yamato/all-urp_performance_boatattack.yml +++ b/.yamato/all-urp_performance_boatattack.yml @@ -7,8 +7,8 @@ --- -All_URP_Performance_BoatAttack_trunk: - name: All URP_Performance_BoatAttack CI - trunk +PR_URP_Performance_BoatAttack_trunk: + name: URP_Performance_BoatAttack PR Job - trunk dependencies: - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_playmode_runtime_mono_Linear_trunk rerun: on-new-revision @@ -43,8 +43,13 @@ All_URP_Performance_BoatAttack_trunk: TEST_FILTER: .* BOAT_ATTACK_BRANCH: master BOAT_ATTACK_REVISION: 88679d7ebeeae4be30f43ebe88cba830f363803b -All_URP_Performance_BoatAttack_CUSTOM-REVISION: - name: All URP_Performance_BoatAttack CI - CUSTOM-REVISION +Nightly_URP_Performance_BoatAttack_trunk: + name: Nightly URP_Performance_BoatAttack - trunk + dependencies: + - path: .yamato/all-urp_performance_boatattack.yml#PR_URP_Performance_BoatAttack_trunk + rerun: on-new-revision +PR_URP_Performance_BoatAttack_CUSTOM-REVISION: + name: URP_Performance_BoatAttack PR Job - CUSTOM-REVISION dependencies: - path: .yamato/urp_performance_boatattack-win-dx11.yml#URP_Performance_BoatAttack_Win_DX11_performance_playmode_runtime_mono_Linear_CUSTOM-REVISION rerun: always @@ -80,3 +85,10 @@ All_URP_Performance_BoatAttack_CUSTOM-REVISION: TEST_FILTER: .* BOAT_ATTACK_BRANCH: master BOAT_ATTACK_REVISION: 88679d7ebeeae4be30f43ebe88cba830f363803b +Nightly_URP_Performance_BoatAttack_CUSTOM-REVISION: + name: Nightly URP_Performance_BoatAttack - CUSTOM-REVISION + dependencies: + - path: .yamato/all-urp_performance_boatattack.yml#PR_URP_Performance_BoatAttack_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-urpupdate.yml b/.yamato/all-urpupdate.yml index a9645b66e08..2bef75f1ddf 100644 --- a/.yamato/all-urpupdate.yml +++ b/.yamato/all-urpupdate.yml @@ -7,28 +7,40 @@ --- -All_URPUpdate_trunk: - name: All URPUpdate CI - trunk +PR_URPUpdate_trunk: + name: URPUpdate PR Job - trunk dependencies: - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_playmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/all-urpupdate_top_asset_store.yml#All_URPUpdate_Top_Asset_Store_trunk + - path: .yamato/all-urpupdate_top_asset_store.yml#PR_URPUpdate_Top_Asset_Store_trunk rerun: on-new-revision variables: UTR_VERSION: "current" TEST_FILTER: .* -All_URPUpdate_CUSTOM-REVISION: - name: All URPUpdate CI - CUSTOM-REVISION +Nightly_URPUpdate_trunk: + name: Nightly URPUpdate - trunk + dependencies: + - path: .yamato/all-urpupdate.yml#PR_URPUpdate_trunk + rerun: on-new-revision +PR_URPUpdate_CUSTOM-REVISION: + name: URPUpdate PR Job - CUSTOM-REVISION dependencies: - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/all-urpupdate_top_asset_store.yml#All_URPUpdate_Top_Asset_Store_CUSTOM-REVISION + - path: .yamato/all-urpupdate_top_asset_store.yml#PR_URPUpdate_Top_Asset_Store_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* +Nightly_URPUpdate_CUSTOM-REVISION: + name: Nightly URPUpdate - CUSTOM-REVISION + dependencies: + - path: .yamato/all-urpupdate.yml#PR_URPUpdate_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-urpupdate_boatattack.yml b/.yamato/all-urpupdate_boatattack.yml index 7e8f2f257ef..998a8ec2453 100644 --- a/.yamato/all-urpupdate_boatattack.yml +++ b/.yamato/all-urpupdate_boatattack.yml @@ -7,8 +7,8 @@ --- -All_URPUpdate_BoatAttack_trunk: - name: All URPUpdate_BoatAttack CI - trunk +PR_URPUpdate_BoatAttack_trunk: + name: URPUpdate_BoatAttack PR Job - trunk dependencies: - path: .yamato/urpupdate_boatattack-win-dx11.yml#URPUpdate_BoatAttack_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision @@ -17,8 +17,13 @@ All_URPUpdate_BoatAttack_trunk: variables: UTR_VERSION: "current" TEST_FILTER: .* -All_URPUpdate_BoatAttack_CUSTOM-REVISION: - name: All URPUpdate_BoatAttack CI - CUSTOM-REVISION +Nightly_URPUpdate_BoatAttack_trunk: + name: Nightly URPUpdate_BoatAttack - trunk + dependencies: + - path: .yamato/all-urpupdate_boatattack.yml#PR_URPUpdate_BoatAttack_trunk + rerun: on-new-revision +PR_URPUpdate_BoatAttack_CUSTOM-REVISION: + name: URPUpdate_BoatAttack PR Job - CUSTOM-REVISION dependencies: - path: .yamato/urpupdate_boatattack-win-dx11.yml#URPUpdate_BoatAttack_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always @@ -28,3 +33,10 @@ All_URPUpdate_BoatAttack_CUSTOM-REVISION: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* +Nightly_URPUpdate_BoatAttack_CUSTOM-REVISION: + name: Nightly URPUpdate_BoatAttack - CUSTOM-REVISION + dependencies: + - path: .yamato/all-urpupdate_boatattack.yml#PR_URPUpdate_BoatAttack_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-urpupdate_top_asset_store.yml b/.yamato/all-urpupdate_top_asset_store.yml index c874628caa3..4cd4fd63e85 100644 --- a/.yamato/all-urpupdate_top_asset_store.yml +++ b/.yamato/all-urpupdate_top_asset_store.yml @@ -7,8 +7,8 @@ --- -All_URPUpdate_Top_Asset_Store_trunk: - name: All URPUpdate_Top_Asset_Store CI - trunk +PR_URPUpdate_Top_Asset_Store_trunk: + name: URPUpdate_Top_Asset_Store PR Job - trunk dependencies: - path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision @@ -17,8 +17,13 @@ All_URPUpdate_Top_Asset_Store_trunk: variables: UTR_VERSION: "current" TEST_FILTER: .* -All_URPUpdate_Top_Asset_Store_CUSTOM-REVISION: - name: All URPUpdate_Top_Asset_Store CI - CUSTOM-REVISION +Nightly_URPUpdate_Top_Asset_Store_trunk: + name: Nightly URPUpdate_Top_Asset_Store - trunk + dependencies: + - path: .yamato/all-urpupdate_top_asset_store.yml#PR_URPUpdate_Top_Asset_Store_trunk + rerun: on-new-revision +PR_URPUpdate_Top_Asset_Store_CUSTOM-REVISION: + name: URPUpdate_Top_Asset_Store PR Job - CUSTOM-REVISION dependencies: - path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always @@ -28,3 +33,10 @@ All_URPUpdate_Top_Asset_Store_CUSTOM-REVISION: CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* +Nightly_URPUpdate_Top_Asset_Store_CUSTOM-REVISION: + name: Nightly URPUpdate_Top_Asset_Store - CUSTOM-REVISION + dependencies: + - path: .yamato/all-urpupdate_top_asset_store.yml#PR_URPUpdate_Top_Asset_Store_CUSTOM-REVISION + rerun: always + variables: + CUSTOM_REVISION: custom_revision_not_set diff --git a/.yamato/all-vfx_hdrp.yml b/.yamato/all-vfx_hdrp.yml index 891cd051445..ce568a382c4 100644 --- a/.yamato/all-vfx_hdrp.yml +++ b/.yamato/all-vfx_hdrp.yml @@ -7,32 +7,76 @@ --- -All_VFX_HDRP_trunk: - name: All VFX_HDRP CI - trunk +PR_VFX_HDRP_trunk: + name: VFX_HDRP PR Job - trunk dependencies: - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_mono_Linear_trunk rerun: on-new-revision + - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/vfx_hdrp-win-vulkan.yml#VFX_HDRP_Win_Vulkan_Standalone_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/vfx_hdrp-linux-vulkan.yml#VFX_HDRP_Linux_Vulkan_Standalone_mono_Linear_trunk + rerun: on-new-revision + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"] + variables: + UTR_VERSION: "current" + TEST_FILTER: .* +Nightly_VFX_HDRP_trunk: + name: Nightly VFX_HDRP - trunk + dependencies: + - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_trunk + rerun: on-new-revision - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_trunk rerun: on-new-revision - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_trunk rerun: on-new-revision - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_mono_Linear_trunk + - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_playmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/vfx_hdrp-win-vulkan.yml#VFX_HDRP_Win_Vulkan_playmode_mono_Linear_trunk rerun: on-new-revision + - path: .yamato/vfx_hdrp-linux-vulkan.yml#VFX_HDRP_Linux_Vulkan_editmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/vfx_hdrp-linux-vulkan.yml#VFX_HDRP_Linux_Vulkan_playmode_mono_Linear_trunk + rerun: on-new-revision +PR_VFX_HDRP_CUSTOM-REVISION: + name: VFX_HDRP PR Job - CUSTOM-REVISION + dependencies: + - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/vfx_hdrp-win-vulkan.yml#VFX_HDRP_Win_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/vfx_hdrp-linux-vulkan.yml#VFX_HDRP_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"] variables: + CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* -All_VFX_HDRP_CUSTOM-REVISION: - name: All VFX_HDRP CI - CUSTOM-REVISION +Nightly_VFX_HDRP_CUSTOM-REVISION: + name: Nightly VFX_HDRP - CUSTOM-REVISION dependencies: - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_CUSTOM-REVISION rerun: always - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION rerun: always - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION rerun: always - - path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION + - path: .yamato/vfx_hdrp-win-dx12.yml#VFX_HDRP_Win_DX12_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/vfx_hdrp-win-vulkan.yml#VFX_HDRP_Win_Vulkan_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/vfx_hdrp-linux-vulkan.yml#VFX_HDRP_Linux_Vulkan_editmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/vfx_hdrp-linux-vulkan.yml#VFX_HDRP_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION rerun: always variables: CUSTOM_REVISION: custom_revision_not_set - UTR_VERSION: "current" - TEST_FILTER: .* diff --git a/.yamato/all-vfx_urp.yml b/.yamato/all-vfx_urp.yml index 819992e9ef3..76d5b7d5ae7 100644 --- a/.yamato/all-vfx_urp.yml +++ b/.yamato/all-vfx_urp.yml @@ -7,24 +7,52 @@ --- -All_VFX_URP_trunk: - name: All VFX_URP CI - trunk +PR_VFX_URP_trunk: + name: VFX_URP PR Job - trunk dependencies: - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_mono_Linear_trunk rerun: on-new-revision + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"] + variables: + UTR_VERSION: "current" + TEST_FILTER: .* +Nightly_VFX_URP_trunk: + name: Nightly VFX_URP - trunk + dependencies: + - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_trunk + rerun: on-new-revision - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_trunk rerun: on-new-revision + - path: .yamato/vfx_urp-linux-vulkan.yml#VFX_URP_Linux_Vulkan_playmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/vfx_urp-osx-metal.yml#VFX_URP_OSX_Metal_playmode_mono_Linear_trunk + rerun: on-new-revision + - path: .yamato/vfx_urp-iphone-metal.yml#VFX_URP_iPhone_Metal_Standalone_il2cpp_Linear_trunk + rerun: on-new-revision +PR_VFX_URP_CUSTOM-REVISION: + name: VFX_URP PR Job - CUSTOM-REVISION + dependencies: + - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + rerun: always + triggers: + expression: pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"] variables: + CUSTOM_REVISION: custom_revision_not_set UTR_VERSION: "current" TEST_FILTER: .* -All_VFX_URP_CUSTOM-REVISION: - name: All VFX_URP CI - CUSTOM-REVISION +Nightly_VFX_URP_CUSTOM-REVISION: + name: Nightly VFX_URP - CUSTOM-REVISION dependencies: - - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_Standalone_mono_Linear_CUSTOM-REVISION + - path: .yamato/all-vfx_urp.yml#PR_VFX_URP_CUSTOM-REVISION rerun: always - path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_CUSTOM-REVISION rerun: always + - path: .yamato/vfx_urp-linux-vulkan.yml#VFX_URP_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/vfx_urp-osx-metal.yml#VFX_URP_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION + rerun: always + - path: .yamato/vfx_urp-iphone-metal.yml#VFX_URP_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION + rerun: always variables: CUSTOM_REVISION: custom_revision_not_set - UTR_VERSION: "current" - TEST_FILTER: .* diff --git a/.yamato/config/_abv.metafile b/.yamato/config/_abv.metafile index c8544bc60d1..631dd50bdc7 100644 --- a/.yamato/config/_abv.metafile +++ b/.yamato/config/_abv.metafile @@ -13,74 +13,6 @@ abv: # specify the editor versions for which to create the expression trigger fo weekly: extra_dependencies: # additional project jobs to run weekly [] -nightly: - extra_dependencies: # additional project jobs to run nightly (in addition to ABV) - - project: Smoke_Test - platform: Win - api: DX11 - build_config: mono - color_space: Linear - test_platforms: - - playmode - - editmode - - Standalone - - project: Universal - platform: Android - api: OpenGLES3 - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - project: Universal - platform: Android - api: Vulkan - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - project: Universal - platform: iPhone - api: Metal - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - project: Universal - platform: Win - api: Vulkan - build_config: mono - color_space: Linear - test_platforms: - - playmode - - playmode_XR - - project: Universal - platform: Win - api: DX12 - build_config: mono - color_space: Linear - test_platforms: - - Standalone - - editmode - - playmode - # - playmode_XR # uncomment once bug fixed on XR side - - project: URPUpdate - platform: Win - api: DX11 - build_config: mono - color_space: Linear - test_platforms: - - editmode - - playmode - - project: URPUpdate_Top_Asset_Store - platform: Win - api: DX11 - build_config: mono - color_space: Linear - test_platforms: - - editmode - - playmode - - project: URP_Performance_BoatAttack - all: true trunk_verification: # jobs to include in trunk verification job dependencies: - project: Universal diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index 9ff1bf8de9b..0b119fce49f 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -12,6 +12,8 @@ test_platforms: - type: Standalone utr_flags: - [OSX_Metal]: --timeout=2400 +expression_trigger: + expression: 'pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"]' platforms: - name: Win apis: @@ -60,33 +62,29 @@ platforms: - name: mono color_spaces: - Linear -all: +pr: dependencies: - platform: Win api: DX11 build_config: mono color_space: Linear test_platforms: - - editmode + - Standalone - playmode - playmode_XR - - Standalone + - editmode - platform: Win api: DX12 build_config: mono color_space: Linear test_platforms: - playmode - - playmode_XR - - Standalone - platform: Win api: Vulkan build_config: mono color_space: Linear test_platforms: - playmode - - playmode_XR - - Standalone - platform: OSX api: Metal build_config: mono @@ -99,16 +97,41 @@ all: build_config: mono color_space: Linear test_platforms: - - editmode - - playmode - Standalone + - playmode + - project: HDRP_DXR + pr: true + - project: HDRP_Hybrid + pr: true + - project: VFX_HDRP + pr: true +nightly: + dependencies: + - project: HDRP + pr: true - project: HDRP_DXR - platform: Win + nightly: true + - project: HDRP_Hybrid + nightly: true + - project: VFX_HDRP + nightly: true + - platform: Win api: DX12 build_config: mono color_space: Linear test_platforms: - - playmode + - Standalone - playmode_XR - - project: HDRP_Hybrid - all: true + - platform: Win + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - Standalone + - playmode_XR + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - editmode \ No newline at end of file diff --git a/.yamato/config/hdrp_dxr.metafile b/.yamato/config/hdrp_dxr.metafile index 7118ba260a1..010d9752013 100644 --- a/.yamato/config/hdrp_dxr.metafile +++ b/.yamato/config/hdrp_dxr.metafile @@ -8,6 +8,8 @@ test_platforms: name: playmode_XR utr_flags: - [all]: --extra-editor-arg="-xr-tests" +expression_trigger: + expression: "" platforms: - name: Win apis: @@ -22,7 +24,7 @@ platforms: image: graphics-foundation/win10-dxr:stable flavor: b1.large model: rtx2080 -all: +pr: dependencies: - platform: Win api: DX12 @@ -30,6 +32,15 @@ all: color_space: Linear test_platforms: - Standalone - - playmode +nightly: + dependencies: + - project: HDRP_DXR + pr: true + - platform: Win + api: DX12 + build_config: mono + color_space: Linear + test_platforms: - playmode_XR + - playmode diff --git a/.yamato/config/hdrp_hybrid.metafile b/.yamato/config/hdrp_hybrid.metafile index eaa22725504..49a3ca6ce44 100644 --- a/.yamato/config/hdrp_hybrid.metafile +++ b/.yamato/config/hdrp_hybrid.metafile @@ -19,7 +19,8 @@ test_platforms: - [OSX_Metal]: --timeout=2400 utr_flags_build: - [all]: --compilation-errors-as-warnings - +expression_trigger: + expression: "" platforms: - name: Win apis: @@ -52,13 +53,22 @@ platforms: - name: mono color_spaces: - Linear -all: +pr: + dependencies: + - platform: Win + api: DX11 + build_config: mono + color_space: Linear + test_platforms: + - Standalone +nightly: dependencies: - platform: Win api: DX11 build_config: mono color_space: Linear test_platforms: - - playmode - playmode_XR - # - Standalone + - playmode + - project: HDRP_Hybrid + pr: true \ No newline at end of file diff --git a/.yamato/config/shadergraph.metafile b/.yamato/config/shadergraph.metafile index 77b4f52c06f..fac211db99b 100644 --- a/.yamato/config/shadergraph.metafile +++ b/.yamato/config/shadergraph.metafile @@ -7,6 +7,8 @@ test_platforms: - [OSX_Metal]: --timeout=2400 - type: playmode - type: editmode +expression_trigger: + expression: 'pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"]' platforms: - name: Win apis: @@ -38,7 +40,34 @@ platforms: - name: mono color_spaces: - Linear -all: + - name: iPhone + apis: + - name: Metal + exclude_test_platforms: + - name: playmode + - name: editmode + - name: playmode_XR + build_configs: + - name: il2cpp + color_spaces: + - Linear + - name: Android + apis: + - 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 + color_spaces: + - Linear +pr: dependencies: - platform: Win api: DX11 @@ -46,14 +75,57 @@ all: color_space: Linear test_platforms: - Standalone - - editmode - - playmode - platform: OSX api: OpenGLCore build_config: mono color_space: Linear test_platforms: - editmode + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - Standalone + - platform: OSX + api: Metal + build_config: mono + color_space: Linear + test_platforms: + # - Standalone + - playmode + - platform: iPhone + api: Metal + build_config: il2cpp + color_space: Linear + test_platforms: + - Standalone - project: ShaderGraph_Stereo - all: true - + pr: true +nightly: + dependencies: + - project: ShaderGraph + pr: true + - project: ShaderGraph_Stereo + nightly: true + - platform: Win + api: DX11 + build_config: mono + color_space: Linear + test_platforms: + - editmode + - playmode + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - editmode + - playmode + - platform: Android + api: Vulkan + build_config: il2cpp + color_space: Linear + test_platforms: + - Standalone + diff --git a/.yamato/config/shadergraph_stereo.metafile b/.yamato/config/shadergraph_stereo.metafile index c800818e20c..ca301bcf087 100644 --- a/.yamato/config/shadergraph_stereo.metafile +++ b/.yamato/config/shadergraph_stereo.metafile @@ -3,7 +3,6 @@ project: folder: ShaderGraphUniversalStereo test_platforms: - type: Standalone -# - type: playmode - type: editmode platforms: - name: Win @@ -12,7 +11,9 @@ platforms: - name: mono color_spaces: - Linear -all: +expression_trigger: + expression: "" +pr: dependencies: - platform: Win api: '' @@ -21,4 +22,7 @@ all: test_platforms: - Standalone - editmode - # - playmode +nightly: + dependencies: + - project: ShaderGraph_Stereo + pr: true \ No newline at end of file diff --git a/.yamato/config/smoke_test.metafile b/.yamato/config/smoke_test.metafile index db8805af546..fd6ee23b06a 100644 --- a/.yamato/config/smoke_test.metafile +++ b/.yamato/config/smoke_test.metafile @@ -13,7 +13,9 @@ platforms: - name: mono color_spaces: - Linear -all: +expression_trigger: + expression: "" +pr: dependencies: - platform: Win api: DX11 @@ -23,4 +25,7 @@ all: - playmode - editmode - Standalone - \ No newline at end of file +nightly: + dependencies: + - project: Smoke_Test + pr: true \ No newline at end of file diff --git a/.yamato/config/universal.metafile b/.yamato/config/universal.metafile index ed8d4c7877f..18f7f9c4cfa 100644 --- a/.yamato/config/universal.metafile +++ b/.yamato/config/universal.metafile @@ -15,6 +15,8 @@ test_platforms: name: playmode_XR utr_flags: - [all]: --extra-editor-arg="-xr-tests" +expression_trigger: + expression: 'pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"]' platforms: - name: Win apis: @@ -78,7 +80,7 @@ platforms: - name: il2cpp color_spaces: - Linear -all: +pr: dependencies: - platform: Win api: DX11 @@ -86,9 +88,44 @@ all: color_space: Linear test_platforms: - Standalone - - editmode - - playmode - playmode_XR + - editmode + - platform: Win + api: DX12 + build_config: mono + color_space: Linear + test_platforms: + - Standalone + - platform: Win + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - Standalone + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - Standalone + - platform: Android + api: OpenGLES3 + build_config: il2cpp + color_space: Linear + test_platforms: + - Standalone + - platform: Android + api: Vulkan + build_config: il2cpp + color_space: Linear + test_platforms: + - Standalone + - platform: iPhone + api: Metal + build_config: il2cpp + color_space: Linear + test_platforms: + - Standalone - platform: OSX api: Metal build_config: mono @@ -121,6 +158,48 @@ all: test_platforms: - Standalone - project: Universal_Stereo - all: true + pr: true + - project: Universal_Hybrid + pr: true + - project: VFX_URP + pr: true + - project: ShaderGraph + pr: true +nightly: + dependencies: + - project: Universal + pr: true + - project: Universal_Stereo + nightly: true - project: Universal_Hybrid - all: true + nightly: true + - project: VFX_URP + nightly: true + - project: ShaderGraph + nightly: true + - platform: Win + api: DX11 + build_config: mono + color_space: Linear + test_platforms: + - playmode + - platform: Win + api: DX12 + build_config: mono + color_space: Linear + test_platforms: + - playmode + - playmode_XR + - platform: Win + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode + - playmode_XR + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode \ No newline at end of file diff --git a/.yamato/config/universal_hybrid.metafile b/.yamato/config/universal_hybrid.metafile index f45eacb73cd..bc6808c33c4 100644 --- a/.yamato/config/universal_hybrid.metafile +++ b/.yamato/config/universal_hybrid.metafile @@ -12,6 +12,8 @@ test_platforms: - type: playmode utr_flags: - [all]: --compilation-errors-as-warnings +expression_trigger: + expression: "" platforms: - name: Win apis: @@ -57,7 +59,7 @@ platforms: - name: mono color_spaces: - Linear -all: +pr: dependencies: - platform: Win api: DX11 @@ -70,4 +72,8 @@ all: build_config: mono color_space: Linear test_platforms: - - playmode \ No newline at end of file + - playmode +nightly: + dependencies: + - project: Universal_Hybrid + pr: true \ No newline at end of file diff --git a/.yamato/config/universal_perf_boatattack.metafile b/.yamato/config/universal_perf_boatattack.metafile index 0c41d8f1128..42345199327 100644 --- a/.yamato/config/universal_perf_boatattack.metafile +++ b/.yamato/config/universal_perf_boatattack.metafile @@ -97,6 +97,8 @@ test_platforms: - apply: [Win_DX11, Win_DX12, Win_Vulkan] utr_flags: - [Win_DX11, Win_DX12, Win_Vulkan]: --testfilter=High +expression_trigger: + expression: "" platforms: - name: Win apis: @@ -179,7 +181,7 @@ platforms: - name: mono color_spaces: - Linear -all: +pr: dependencies: - platform: Win api: DX11 @@ -225,4 +227,8 @@ all: color_space: Linear test_platforms: - performance_playmode_runtime - - performance_build_editmode \ No newline at end of file + - performance_build_editmode +nightly: + dependencies: + - project: URP_Performance_BoatAttack + pr: true \ No newline at end of file diff --git a/.yamato/config/universal_stereo.metafile b/.yamato/config/universal_stereo.metafile index 8ac828cc52d..cb0c1f54529 100644 --- a/.yamato/config/universal_stereo.metafile +++ b/.yamato/config/universal_stereo.metafile @@ -5,8 +5,9 @@ test_platforms: - type: Standalone utr_flags: - [all]: compilation-errors-as-warnings - # - type: playmode - type: editmode +expression_trigger: + expression: "" platforms: - name: Win apis: @@ -14,7 +15,7 @@ platforms: - name: mono color_spaces: - Linear -all: +pr: dependencies: - platform: Win api: '' @@ -23,4 +24,7 @@ all: test_platforms: - Standalone - editmode - # - playmode +nightly: + dependencies: + - project: Universal_Stereo + pr: true \ No newline at end of file diff --git a/.yamato/config/update_assetstore.metafile b/.yamato/config/update_assetstore.metafile index b47f36ced85..2985141adba 100644 --- a/.yamato/config/update_assetstore.metafile +++ b/.yamato/config/update_assetstore.metafile @@ -4,6 +4,8 @@ project: test_platforms: - type: playmode - type: editmode +expression_trigger: + expression: "" platforms: - name: Win apis: @@ -21,7 +23,7 @@ platforms: # - name: mono # color_spaces: # - Linear -all: +pr: dependencies: - platform: Win api: DX11 @@ -30,3 +32,7 @@ all: test_platforms: - editmode - playmode +nightly: + dependencies: + - project: URPUpdate_Top_Asset_Store + pr: true \ No newline at end of file diff --git a/.yamato/config/update_boatattack.metafile b/.yamato/config/update_boatattack.metafile index 2a42bd2171d..0bd1922fea9 100644 --- a/.yamato/config/update_boatattack.metafile +++ b/.yamato/config/update_boatattack.metafile @@ -4,6 +4,8 @@ project: test_platforms: - type: playmode - type: editmode +expression_trigger: + expression: "" platforms: - name: Win apis: @@ -21,7 +23,7 @@ platforms: # - name: mono # color_spaces: # - Linear -all: +pr: dependencies: - platform: Win api: DX11 @@ -30,3 +32,7 @@ all: test_platforms: - editmode - playmode +nightly: + dependencies: + - project: URPUpdate_BoatAttack + pr: true \ No newline at end of file diff --git a/.yamato/config/update_template.metafile b/.yamato/config/update_template.metafile index 5e448819e6d..0617082951d 100644 --- a/.yamato/config/update_template.metafile +++ b/.yamato/config/update_template.metafile @@ -4,6 +4,8 @@ project: test_platforms: - type: playmode - type: editmode +expression_trigger: + expression: "" platforms: - name: Win apis: @@ -21,7 +23,7 @@ platforms: # - name: mono # color_spaces: # - Linear -all: +pr: dependencies: - platform: Win api: DX11 @@ -31,6 +33,10 @@ all: - editmode - playmode # - project: URPUpdate_BoatAttack -# all: true +# pr: true - project: URPUpdate_Top_Asset_Store - all: true + pr: true +nightly: + dependencies: + - project: URPUpdate + pr: true \ No newline at end of file diff --git a/.yamato/config/vfx_hdrp.metafile b/.yamato/config/vfx_hdrp.metafile index 6a64548e41d..481aefd61ba 100644 --- a/.yamato/config/vfx_hdrp.metafile +++ b/.yamato/config/vfx_hdrp.metafile @@ -11,16 +11,38 @@ test_platforms: utr_flags: - [all]: --extra-editor-arg="-xr-tests" - type: editmode +expression_trigger: + expression: 'pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_HDRP/**/*"]' platforms: - name: Win apis: - name: DX11 - # - name: DX12 + - name: DX12 - name: Vulkan build_configs: - name: mono color_spaces: - Linear + agents_project: + # default: package_ci_mac + default: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.xlarge + model: rtx2080 + editmode: + type: Unity::VM + image: sdet/gamecode_win10:stable + flavor: b1.large + standalone: + type: Unity::VM::GPU + image: sdet/gamecode_win10:stable + flavor: b1.xlarge + model: rtx2080 + standalone_build: + type: Unity::VM + image: sdet/gamecode_win10:stable + flavor: b1.xlarge - name: OSX apis: - name: Metal @@ -39,7 +61,7 @@ platforms: - name: mono color_spaces: - Linear -all: +pr: dependencies: - platform: Win api: DX11 @@ -47,6 +69,52 @@ all: color_space: Linear test_platforms: - Standalone + - playmode_XR + - platform: Win + api: DX12 + build_config: mono + color_space: Linear + test_platforms: + - Standalone + - platform: Win + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - Standalone + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - Standalone +nightly: + dependencies: + - project: VFX_HDRP + pr: true + - platform: Win + api: DX11 + build_config: mono + color_space: Linear + test_platforms: - editmode - playmode - - playmode_XR + - platform: Win + api: DX12 + build_config: mono + color_space: Linear + test_platforms: + - playmode + - platform: Win + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - editmode + - playmode \ No newline at end of file diff --git a/.yamato/config/vfx_urp.metafile b/.yamato/config/vfx_urp.metafile index bbd060cf0b3..e1f60f18886 100644 --- a/.yamato/config/vfx_urp.metafile +++ b/.yamato/config/vfx_urp.metafile @@ -7,6 +7,8 @@ test_platforms: - [OSX_Metal]: --timeout=2400 - type: playmode # - type: editmode +expression_trigger: + expression: 'pull_request.target eq "{target_branch}" AND NOT pull_request.draft AND pull_request.push.changes.all match ["com.unity.visualeffectgraph/**/*", "TestProjects/VisualEffectGraph_URP/**/*"]' platforms: - name: Win apis: @@ -43,6 +45,17 @@ platforms: - name: mono color_spaces: - Linear + - name: iPhone + apis: + - name: Metal + exclude_test_platforms: + - name: playmode + - name: editmode + - name: playmode_XR + build_configs: + - name: il2cpp + color_spaces: + - Linear # - name: Android # apis: # - name: Vulkan @@ -51,14 +64,7 @@ platforms: # - name: mono # color_spaces: # - Linear -# - name: iPhone -# apis: -# - name: Metal -# build_configs: -# - name: mono -# color_spaces: -# - Linear -all: +pr: dependencies: - platform: Win api: DX11 @@ -66,4 +72,32 @@ all: color_space: Linear test_platforms: - Standalone - - playmode \ No newline at end of file +nightly: + dependencies: + - project: VFX_URP + pr: true + - platform: Win + api: DX11 + build_config: mono + color_space: Linear + test_platforms: + - playmode + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode + - platform: OSX + api: Metal + build_config: mono + color_space: Linear + test_platforms: + # - Standalone + - playmode + - platform: iPhone + api: Metal + build_config: il2cpp + color_space: Linear + test_platforms: + - Standalone \ No newline at end of file diff --git a/.yamato/docs/readme.md b/.yamato/docs/readme.md index 06d0d1dc4df..3f522cb6ae8 100644 --- a/.yamato/docs/readme.md +++ b/.yamato/docs/readme.md @@ -30,7 +30,7 @@ The majority of changes are introduced within metafiles (*.yamato/config/\*.meta - Add job to trunk verification: add the dependency under trunk_verification.dependencies ### Project related changes (project_name.metafile) -- Adding a new job to All_{project_name}: add the new job under all.dependencies (this job can also be from a different project) +- Adding a new job to {project_name}_PR: add the new job under pr.dependencies (this job can also be from a different project) - Adding a new platform/api for the project: extend the list under platforms as indicated - Creating a new project: create a new metafile same way as is done for existing projects. All ymls get created once the script runs - Use different agent than what is specified in the shared metafile: override the agent as described in the metafile description under platforms section @@ -584,9 +584,9 @@ platforms: - name: OSX ... -# which jobs to run under All_{project_name} job +# which jobs to run under {project_name}_PR job # this is the same structure as in abv nightly extra dependencies -all: +pr: dependencies: - platform: OSX # use this to refer to the current project api: Metal @@ -599,7 +599,7 @@ all: test_platforms: - playmode - project: HDRP_DXR # use this if there is a dependency to another project - all: true + pr: true - ... ``` diff --git a/.yamato/ruamel/jobs/abv/abv_all_project_ci.py b/.yamato/ruamel/jobs/abv/abv_all_project_ci.py index b4a7cca2ca8..01fe897d0fa 100644 --- a/.yamato/ruamel/jobs/abv/abv_all_project_ci.py +++ b/.yamato/ruamel/jobs/abv/abv_all_project_ci.py @@ -19,12 +19,12 @@ def get_job_definition(self, editor, projects, target_branch): for project in projects: dependencies.append({ - 'path': f'{project_filepath_all(project["name"])}#{project_job_id_all(project["name"], editor["name"])}', + 'path': f'{project_filepath_all(project["name"])}#{project_job_id_pr(project["name"], editor["name"])}', 'rerun': editor["rerun_strategy"]}) # construct job job = YMLJob() - job.set_name(f'_ABV for SRP repository - {editor["name"]}') + job.set_name(f'_ABV for SRP repository (all PR jobs) - {editor["name"]}') job.add_dependencies(dependencies) job.add_var_custom_revision(editor["track"]) # (Temporarily?) disable automatic runs of the ABV for PRs diff --git a/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py b/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py index 4774b03932d..4bdb7a915f7 100644 --- a/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py +++ b/.yamato/ruamel/jobs/abv/abv_all_project_ci_nightly.py @@ -4,37 +4,24 @@ class ABV_AllProjectCiNightlyJob(): - def __init__(self, editor, projects, nightly_config, target_branch, build_configs, color_space): + def __init__(self, editor, projects, target_branch): self.job_id = abv_job_id_all_project_ci_nightly(editor["name"]) - self.yml = self.get_job_definition(editor, projects, nightly_config.get("extra_dependencies",[]), target_branch, build_configs, color_space).get_yml() + self.yml = self.get_job_definition(editor, projects, target_branch).get_yml() - def get_job_definition(self, editor, projects, extra_dependencies, target_branch, build_configs, color_space): - + def get_job_definition(self, editor, projects, target_branch): + # define dependencies - dependencies = [ - { - 'path': f'{abv_filepath()}#{abv_job_id_all_project_ci(editor["name"])}', - 'rerun': editor["rerun_strategy"]}, - # Todo: re-add template tests to the nightly once the publishing issue with upm-ci template test is fixed: - # "(There has never been a full release of this package. The major must be 0 or 1.)" - # { - # 'path': f'{templates_filepath()}#{template_job_id_test_all(editor["track"])}', - # 'rerun': editor["rerun_strategy"] - # } - ] + dependencies = [{ + 'path': f'{projectcontext_filepath()}#{projectcontext_job_id_test_all(editor["name"])}', + 'rerun': editor["rerun_strategy"] + }] + + for project in projects: + dependencies.append({ + 'path': f'{project_filepath_all(project["name"])}#{project_job_id_nightly(project["name"], editor["name"])}', + 'rerun': editor["rerun_strategy"]}) - for dep in extra_dependencies: - if dep.get("all"): - dependencies.append({ - 'path': f'{project_filepath_all(dep["project"])}#{project_job_id_all(dep["project"], editor["name"])}', - 'rerun': editor["rerun_strategy"]}) - else: - for tp in dep["test_platforms"]: - dependencies.append({ - 'path': f'{project_filepath_specific(dep["project"], dep["platform"], dep["api"])}#{project_job_id_test(dep["project"], dep["platform"], dep["api"], tp, editor["name"], dep["build_config"], dep["color_space"])}', - 'rerun': editor["rerun_strategy"]}) - # construct job job = YMLJob() job.set_name(f'_Nightly ABV against { editor["name"] }') diff --git a/.yamato/ruamel/jobs/abv/abv_all_project_ci_weekly.py b/.yamato/ruamel/jobs/abv/abv_all_project_ci_weekly.py index e1ee91b924b..29723cd2dcb 100644 --- a/.yamato/ruamel/jobs/abv/abv_all_project_ci_weekly.py +++ b/.yamato/ruamel/jobs/abv/abv_all_project_ci_weekly.py @@ -12,9 +12,9 @@ def __init__(self, editor, projects, weekly_config, target_branch, build_configs def get_job_definition(self, editor, projects, extra_dependencies, target_branch, build_configs, color_space): dependencies = [] for dep in extra_dependencies: - if dep.get("all"): + if dep.get("pr"): dependencies.append({ - 'path': f'{project_filepath_all(dep["project"])}#{project_job_id_all(dep["project"], editor["name"])}', + 'path': f'{project_filepath_all(dep["project"])}#{project_job_id_pr(dep["project"], editor["name"])}', 'rerun': editor["rerun_strategy"]}) else: for tp in dep["test_platforms"]: diff --git a/.yamato/ruamel/jobs/abv/abv_trunk_verification.py b/.yamato/ruamel/jobs/abv/abv_trunk_verification.py index 4b35286dcd7..26bf4717b1c 100644 --- a/.yamato/ruamel/jobs/abv/abv_trunk_verification.py +++ b/.yamato/ruamel/jobs/abv/abv_trunk_verification.py @@ -14,9 +14,9 @@ def get_job_definition(self, editor, extra_dependencies): # define dependencies dependencies = [] for dep in extra_dependencies: - if dep.get("all"): + if dep.get("pr"): dependencies.append({ - 'path': f'{project_filepath_all(dep["project"])}#{project_job_id_all(dep["project"], editor["name"])}', + 'path': f'{project_filepath_all(dep["project"])}#{project_job_id_pr(dep["project"], editor["name"])}', 'rerun': editor["rerun_strategy"]}) else: for tp in dep["test_platforms"]: diff --git a/.yamato/ruamel/jobs/abv/yml_abv.py b/.yamato/ruamel/jobs/abv/yml_abv.py index 80b3791c931..b47020fcdde 100644 --- a/.yamato/ruamel/jobs/abv/yml_abv.py +++ b/.yamato/ruamel/jobs/abv/yml_abv.py @@ -13,7 +13,7 @@ def create_abv_ymls(metafile): yml[job.job_id] = job.yml if editor.get("nightly"): - job = ABV_AllProjectCiNightlyJob(editor, metafile["abv"]["projects"], metafile["nightly"], metafile["target_branch"], metafile["abv"]["build_configs"], metafile["abv"]["color_spaces"]) + job = ABV_AllProjectCiNightlyJob(editor, metafile["abv"]["projects"],metafile["target_branch"]) yml[job.job_id] = job.yml if editor.get("weekly"): diff --git a/.yamato/ruamel/jobs/packages/project_test_all.py b/.yamato/ruamel/jobs/packages/project_test_all.py index 07b0a18f9bb..2f0878a762f 100644 --- a/.yamato/ruamel/jobs/packages/project_test_all.py +++ b/.yamato/ruamel/jobs/packages/project_test_all.py @@ -27,6 +27,7 @@ def get_job_definition(self, packages, agent, platforms, target_branch, editor): job.set_agent(agent) job.add_dependencies(dependencies) job.add_var_custom_revision(editor["track"]) + job.set_trigger_on_expression(f'push.branch eq "{target_branch}" AND NOT pull_request.draft') job.add_commands([ f'npm install upm-ci-utils@stable -g --registry {NPM_UPMCI_INSTALL_URL}', f'upm-ci package izon -t', diff --git a/.yamato/ruamel/jobs/projects/project_nightly.py b/.yamato/ruamel/jobs/projects/project_nightly.py new file mode 100644 index 00000000000..cb73f62062a --- /dev/null +++ b/.yamato/ruamel/jobs/projects/project_nightly.py @@ -0,0 +1,50 @@ +from ruamel.yaml.scalarstring import DoubleQuotedScalarString as dss +from ..shared.namer import * +from ..shared.yml_job import YMLJob + +class Project_NightlyJob(): + + def __init__(self, project, editor, dependencies_in_nightly): + self.project = project + self.job_id = project_job_id_nightly(project, editor["name"]) + self.yml = self.get_job_definition(project, editor, dependencies_in_nightly).get_yml() + + + def get_job_definition(self, project, editor, dependencies_in_nightly): + + # define dependencies + dependencies = [] + for dep in dependencies_in_nightly: + project_dep = dep.get('project', project) + + if dep.get("pr"): + dependencies.append({ + 'path': f'{project_filepath_all(project_dep)}#{project_job_id_pr(project_dep, editor["name"])}', + 'rerun': editor["rerun_strategy"]}) + elif dep.get("nightly"): + dependencies.append({ + 'path': f'{project_filepath_all(project_dep)}#{project_job_id_nightly(project_dep, editor["name"])}', + 'rerun': editor["rerun_strategy"]}) + else: + for test_platform in dep["test_platforms"]: + + file = project_filepath_specific(project_dep, dep["platform"], dep["api"]) + job_id = project_job_id_test(project_dep,dep["platform"],dep["api"],test_platform,editor["name"],dep["build_config"],dep["color_space"]) + + dependencies.append({ + 'path' : f'{file}#{job_id}', + 'rerun' : editor["rerun_strategy"]}) + + # construct job + job = YMLJob() + job.set_name(f'Nightly {project} - {editor["name"]}') + job.add_dependencies(dependencies) + # if expression_trigger != "": + # job.set_trigger_on_expression(expression_trigger) + job.add_var_custom_revision(editor["track"]) + # if project == "URP_Performance_BoatAttack": + # job.add_var_custom('BOAT_ATTACK_BRANCH', 'master') + # job.add_var_custom('BOAT_ATTACK_REVISION', '60b6bc595f20b29f4869d3236ce1aa91a490ef6b') + return job + + \ No newline at end of file diff --git a/.yamato/ruamel/jobs/projects/project_all.py b/.yamato/ruamel/jobs/projects/project_pr.py similarity index 71% rename from .yamato/ruamel/jobs/projects/project_all.py rename to .yamato/ruamel/jobs/projects/project_pr.py index 741d0cdbd2a..0fef2aaa906 100644 --- a/.yamato/ruamel/jobs/projects/project_all.py +++ b/.yamato/ruamel/jobs/projects/project_pr.py @@ -2,24 +2,24 @@ from ..shared.namer import * from ..shared.yml_job import YMLJob -class Project_AllJob(): +class Project_PRJob(): - def __init__(self, project, editor, dependencies_in_all): + def __init__(self, project, editor, expression_trigger, dependencies_in_all): self.project = project - self.job_id = project_job_id_all(project, editor["name"]) - self.yml = self.get_job_definition(project, editor, dependencies_in_all).get_yml() + self.job_id = project_job_id_pr(project, editor["name"]) + self.yml = self.get_job_definition(project, editor, expression_trigger, dependencies_in_all).get_yml() - def get_job_definition(self, project, editor, dependencies_in_all): + def get_job_definition(self, project, editor, expression_trigger, dependencies_in_all): # define dependencies dependencies = [] for dep in dependencies_in_all: project_dep = dep.get('project', project) - if dep.get("all"): + if dep.get("pr"): dependencies.append({ - 'path': f'{project_filepath_all(project_dep)}#{project_job_id_all(project_dep, editor["name"])}', + 'path': f'{project_filepath_all(project_dep)}#{project_job_id_pr(project_dep, editor["name"])}', 'rerun': editor["rerun_strategy"]}) else: for test_platform in dep["test_platforms"]: @@ -33,8 +33,10 @@ def get_job_definition(self, project, editor, dependencies_in_all): # construct job job = YMLJob() - job.set_name(f'All {project} CI - {editor["name"]}') + job.set_name(f'{project} PR Job - {editor["name"]}') job.add_dependencies(dependencies) + if expression_trigger != "": + job.set_trigger_on_expression(expression_trigger) job.add_var_custom_revision(editor["track"]) job.add_var_custom('UTR_VERSION', dss("current")) job.add_var_custom('TEST_FILTER', '.*') diff --git a/.yamato/ruamel/jobs/projects/yml_project.py b/.yamato/ruamel/jobs/projects/yml_project.py index ec13877bdff..c8f8dd4fbfd 100644 --- a/.yamato/ruamel/jobs/projects/yml_project.py +++ b/.yamato/ruamel/jobs/projects/yml_project.py @@ -1,10 +1,10 @@ from .project_not_standalone import Project_NotStandaloneJob from .project_standalone import Project_StandaloneJob from ..shared.namer import project_filepath_specific -from .project_all import Project_AllJob +from .project_pr import Project_PRJob +from .project_nightly import Project_NightlyJob from ..shared.namer import project_filepath_all - def create_project_ymls(metafile): yml_files = {} @@ -12,12 +12,27 @@ def create_project_ymls(metafile): # project_all yml file yml = {} for editor in metafile['editors']: - job = Project_AllJob(metafile["project"]["name"], editor, metafile["all"]["dependencies"]) + expression = "" + if metafile["expression_trigger"]["expression"] != "": + expression = metafile["expression_trigger"]["expression"] + job = Project_PRJob(metafile["project"]["name"], editor, expression, metafile["pr"]["dependencies"]) + yml[job.job_id] = job.yml + + job = Project_NightlyJob(metafile["project"]["name"], editor, metafile["nightly"]["dependencies"]) yml[job.job_id] = job.yml yml_file = project_filepath_all(metafile["project"]["name"]) yml_files[yml_file] = yml + # # project_all yml file + # nightly_yml = {} + # for editor in metafile['editors']: + # job = Project_NightlyJob(metafile["project"]["name"], editor, metafile["nightly"]["dependencies"]) + # nightly_yml[job.job_id] = job.nightly_yml + + # yml_file = project_filepath_nightly(metafile["project"]["name"]) + # yml_files[yml_file] = nightly_yml + # project platform_api specific yml files project = metafile["project"] for platform in metafile['platforms']: diff --git a/.yamato/ruamel/jobs/shared/namer.py b/.yamato/ruamel/jobs/shared/namer.py index 3dadd95fd9b..5b70e3cf1eb 100644 --- a/.yamato/ruamel/jobs/shared/namer.py +++ b/.yamato/ruamel/jobs/shared/namer.py @@ -124,8 +124,12 @@ def project_job_id_test(project_name, platform_name, api_name, test_platform_nam def project_job_id_build(project_name, platform_name, api_name, test_platform_name, editor_name, scripting_backend, color_space): return f'Build_{project_name}_{platform_name}_{api_name}_{test_platform_name}_{scripting_backend}_{color_space}_{editor_name}'.replace('__','_') -def project_job_id_all(project_name, editor_name): - return f'All_{project_name}_{ editor_name}' +def project_job_id_pr(project_name, editor_name): + return f'PR_{project_name}_{ editor_name}' + +def project_job_id_nightly(project_name, editor_name): + return f'Nightly_{project_name}_{ editor_name}' + # abv specific diff --git a/.yamato/shadergraph-android-opengles3.yml b/.yamato/shadergraph-android-opengles3.yml new file mode 100644 index 00000000000..2a27a02b975 --- /dev/null +++ b/.yamato/shadergraph-android-opengles3.yml @@ -0,0 +1,140 @@ + +# This file is generated by .yamato/ruamel/build.py. Don't edit this file manually. +# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files. +# Read more under .yamato/docs/readme.md + +{% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%} + +--- + +ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_trunk: + name: ShaderGraph on Android_OpenGLES3_Standalone_il2cpp_Linear on version trunk + agent: + type: Unity::mobile::android + image: mobile/android-execution-r19:stable + flavor: b1.large + variables: + UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates + UTR_VERSION: "current" + TEST_FILTER: .* + commands: + - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat + - '%ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%' + - powershell %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices + - NetSh Advfirewall set allprofiles state off + - |5- + + set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP% + git rev-parse HEAD | git show -s --format=%%cI > revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE= revdate.tmp + set /p GIT_REVISIONDATE=