[Yamato] Refactor ABV (#2843)

* refactor jobs

* Update CONTRIBUTING.md

* update docs

Author: sophiaaar

.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

.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

.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

.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

.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: .*

.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: .*