[2021.1][Yamato] Misc backports (#3175)

* backport #3034 * backport #3168 * backport 650775a * remove win dx12 playmode editor from ci due to 1308059 * Fix urp udate custom revision jobs (#3107) * backport #3129 * fix nightlies * backport #2954 Co-authored-by: Théo Penavaire <theo-pnv@users.noreply.github.com> Co-authored-by: Liis Kivistik <liis.kivistik@unity3d.com>
Unity-Technologies · Jan 21, 2021 · 95a3bba · 95a3bba
1 parent 7305892
commit 95a3bba
Show file tree

Hide file tree

Showing 122 changed files with 5,999 additions and 1,226 deletions.
diff --git a/.yamato/_abv.yml b/.yamato/_abv.yml
@@ -27,6 +27,12 @@ all_project_ci_2021.1:
 all_project_ci_nightly_2021.1:
     name: _Nightly ABV against 2021.1
     dependencies:
+      -  path: .yamato/all-urp_performance_boatattack.yml#PR_URP_Performance_BoatAttack_2021.1
+         rerun: on-new-revision
+      -  path: .yamato/all-urp_performance_lostcrypt.yml#PR_URP_Performance_LostCrypt_2021.1
+         rerun: on-new-revision
+      -  path: .yamato/all-urpupdate.yml#PR_URPUpdate_2021.1
+         rerun: on-new-revision
       -  path: .yamato/_projectcontext.yml#all_package_ci_project_2021.1
          rerun: on-new-revision
       -  path: .yamato/all-universal.yml#Nightly_Universal_2021.1

diff --git a/.yamato/_editor_priming.yml b/.yamato/_editor_priming.yml
@@ -11,7 +11,7 @@ editor:priming:CUSTOM-REVISION:macos:
     name: '[CUSTOM-REVISION,macos] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     skip_checkout: true
     variables:
@@ -30,7 +30,7 @@ editor:priming:test_min_editor:macos:
     name: '[Min_Editor,macos] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     variables:
         PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
@@ -49,7 +49,7 @@ editor:priming:CUSTOM-REVISION:android:
     name: '[CUSTOM-REVISION,android] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     skip_checkout: true
     variables:
@@ -68,7 +68,7 @@ editor:priming:test_min_editor:android:
     name: '[Min_Editor,android] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     variables:
         PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
@@ -87,7 +87,7 @@ editor:priming:CUSTOM-REVISION:windows:
     name: '[CUSTOM-REVISION,windows] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     skip_checkout: true
     variables:
@@ -106,7 +106,7 @@ editor:priming:test_min_editor:windows:
     name: '[Min_Editor,windows] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     variables:
         PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
@@ -125,7 +125,7 @@ editor:priming:CUSTOM-REVISION:linux:
     name: '[CUSTOM-REVISION,linux] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     skip_checkout: true
     variables:
@@ -144,7 +144,7 @@ editor:priming:test_min_editor:linux:
     name: '[Min_Editor,linux] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     variables:
         PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
@@ -163,7 +163,7 @@ editor:priming:CUSTOM-REVISION:ios:
     name: '[CUSTOM-REVISION,ios] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     skip_checkout: true
     variables:
@@ -182,7 +182,7 @@ editor:priming:test_min_editor:ios:
     name: '[Min_Editor,ios] Editor priming'
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     variables:
         PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin

diff --git a/.yamato/_formatting.yml b/.yamato/_formatting.yml
@@ -11,7 +11,7 @@ formatting:
     name: Formatting
     agent:
         type: Unity::VM
-        image: cds-ops/ubuntu-16.04-base:stable
+        image: package-ci/ubuntu:stable
         flavor: b1.small
     commands:
       -  "echo -e \"[extensions]\nlargefiles=\n\" > ~/.hgrc"

diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml
@@ -14,7 +14,7 @@ PR_HDRP_2021.1:
          rerun: on-new-revision
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_2021.1
          rerun: on-new-revision
-      -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_mono_Linear_2021.1
+      -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_cache_mono_Linear_2021.1
          rerun: on-new-revision
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2021.1
          rerun: on-new-revision
@@ -54,22 +54,25 @@ Nightly_HDRP_2021.1:
          rerun: on-new-revision
       -  path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_cache_mono_Linear_2021.1
          rerun: on-new-revision
-      -  path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_2021.1
+      -  path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_cache_mono_Linear_2021.1
          rerun: on-new-revision
       -  path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_cache_mono_Linear_2021.1
          rerun: on-new-revision
-      -  path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_2021.1
+      -  path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_cache_mono_Linear_2021.1
          rerun: on-new-revision
       -  path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_editmode_mono_Linear_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
 PR_HDRP_CUSTOM-REVISION:
     name: HDRP PR Job - CUSTOM-REVISION
     dependencies:
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION
          rerun: always
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION
          rerun: always
-      -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_mono_Linear_CUSTOM-REVISION
+      -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
          rerun: always
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
          rerun: always
@@ -108,13 +111,15 @@ Nightly_HDRP_CUSTOM-REVISION:
          rerun: always
       -  path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_cache_mono_Linear_CUSTOM-REVISION
          rerun: always
-      -  path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_mono_Linear_CUSTOM-REVISION
+      -  path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
          rerun: always
       -  path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION
          rerun: always
-      -  path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_mono_Linear_CUSTOM-REVISION
+      -  path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_XR_cache_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
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
diff --git a/.yamato/all-hdrp_dxr.yml b/.yamato/all-hdrp_dxr.yml
@@ -20,8 +20,11 @@ Nightly_HDRP_DXR_2021.1:
     dependencies:
       -  path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_2021.1
          rerun: on-new-revision
-      -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_mono_Linear_2021.1
+      -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_cache_mono_Linear_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
 PR_HDRP_DXR_CUSTOM-REVISION:
     name: HDRP_DXR PR Job - CUSTOM-REVISION
     dependencies:
@@ -36,7 +39,9 @@ Nightly_HDRP_DXR_CUSTOM-REVISION:
     dependencies:
       -  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/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_cache_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
@@ -18,10 +18,13 @@ PR_HDRP_Hybrid_2021.1:
 Nightly_HDRP_Hybrid_2021.1:
     name: Nightly HDRP_Hybrid - 2021.1
     dependencies:
-      -  path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_mono_Linear_2021.1
+      -  path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_cache_mono_Linear_2021.1
          rerun: on-new-revision
       -  path: .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
 PR_HDRP_Hybrid_CUSTOM-REVISION:
     name: HDRP_Hybrid PR Job - CUSTOM-REVISION
     dependencies:
@@ -34,9 +37,11 @@ PR_HDRP_Hybrid_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
+      -  path: .yamato/hdrp_hybrid-win-dx11.yml#HDRP_Hybrid_Win_DX11_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
          rerun: always
       -  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
@@ -44,6 +44,9 @@ Nightly_ShaderGraph_2021.1:
          rerun: on-new-revision
       -  path: .yamato/shadergraph-android-vulkan.yml#ShaderGraph_Android_Vulkan_Standalone_cache_il2cpp_Linear_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
 PR_ShaderGraph_CUSTOM-REVISION:
     name: ShaderGraph PR Job - CUSTOM-REVISION
     dependencies:
@@ -82,3 +85,5 @@ Nightly_ShaderGraph_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
@@ -22,6 +22,9 @@ Nightly_ShaderGraph_Stereo_2021.1:
     dependencies:
       -  path: .yamato/all-shadergraph_stereo.yml#PR_ShaderGraph_Stereo_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
 PR_ShaderGraph_Stereo_CUSTOM-REVISION:
     name: ShaderGraph_Stereo PR Job - CUSTOM-REVISION
     dependencies:
@@ -40,3 +43,5 @@ Nightly_ShaderGraph_Stereo_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
diff --git a/.yamato/all-smoke_test.yml b/.yamato/all-smoke_test.yml
@@ -24,6 +24,9 @@ Nightly_Smoke_Test_2021.1:
     dependencies:
       -  path: .yamato/all-smoke_test.yml#PR_Smoke_Test_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
 PR_Smoke_Test_CUSTOM-REVISION:
     name: Smoke_Test PR Job - CUSTOM-REVISION
     dependencies:
@@ -44,3 +47,5 @@ Nightly_Smoke_Test_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
diff --git a/.yamato/all-universal.yml b/.yamato/all-universal.yml
@@ -12,7 +12,7 @@ PR_Universal_2021.1:
     dependencies:
       -  path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_cache_mono_Linear_2021.1
          rerun: on-new-revision
-      -  path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_mono_Linear_2021.1
+      -  path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_XR_cache_mono_Linear_2021.1
          rerun: on-new-revision
       -  path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_2021.1
          rerun: on-new-revision
@@ -74,12 +74,15 @@ Nightly_Universal_2021.1:
          rerun: on-new-revision
       -  path: .yamato/universal-linux-vulkan.yml#Universal_Linux_Vulkan_playmode_cache_mono_Linear_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
 PR_Universal_CUSTOM-REVISION:
     name: Universal PR Job - CUSTOM-REVISION
     dependencies:
       -  path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_Standalone_cache_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-dx11.yml#Universal_Win_DX11_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
          rerun: always
       -  path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
          rerun: always
@@ -142,3 +145,5 @@ Nightly_Universal_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
diff --git a/.yamato/all-universal_hybrid.yml b/.yamato/all-universal_hybrid.yml
@@ -22,6 +22,9 @@ Nightly_Universal_Hybrid_2021.1:
     dependencies:
       -  path: .yamato/all-universal_hybrid.yml#PR_Universal_Hybrid_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
 PR_Universal_Hybrid_CUSTOM-REVISION:
     name: Universal_Hybrid PR Job - CUSTOM-REVISION
     dependencies:
@@ -40,3 +43,5 @@ Nightly_Universal_Hybrid_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
diff --git a/.yamato/all-universal_stereo.yml b/.yamato/all-universal_stereo.yml
@@ -22,6 +22,9 @@ Nightly_Universal_Stereo_2021.1:
     dependencies:
       -  path: .yamato/all-universal_stereo.yml#PR_Universal_Stereo_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
 PR_Universal_Stereo_CUSTOM-REVISION:
     name: Universal_Stereo PR Job - CUSTOM-REVISION
     dependencies:
@@ -40,3 +43,5 @@ Nightly_Universal_Stereo_CUSTOM-REVISION:
          rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
diff --git a/.yamato/all-urp_performance_boatattack.yml b/.yamato/all-urp_performance_boatattack.yml
@@ -48,12 +48,17 @@ PR_URP_Performance_BoatAttack_2021.1:
         UTR_VERSION: "current"
         TEST_FILTER: .*
         BOAT_ATTACK_BRANCH: master
-        BOAT_ATTACK_REVISION: 88679d7ebeeae4be30f43ebe88cba830f363803b
+        BOAT_ATTACK_REVISION: d07745c0d9bc97cde5fc4ae86186d6c2f0c2a16c
 Nightly_URP_Performance_BoatAttack_2021.1:
     name: Nightly URP_Performance_BoatAttack - 2021.1
     dependencies:
       -  path: .yamato/all-urp_performance_boatattack.yml#PR_URP_Performance_BoatAttack_2021.1
          rerun: on-new-revision
+    variables:
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
+        BOAT_ATTACK_BRANCH: master
+        BOAT_ATTACK_REVISION: d07745c0d9bc97cde5fc4ae86186d6c2f0c2a16c
 PR_URP_Performance_BoatAttack_CUSTOM-REVISION:
     name: URP_Performance_BoatAttack PR Job - CUSTOM-REVISION
     dependencies:
@@ -96,11 +101,15 @@ PR_URP_Performance_BoatAttack_CUSTOM-REVISION:
         UTR_VERSION: "current"
         TEST_FILTER: .*
         BOAT_ATTACK_BRANCH: master
-        BOAT_ATTACK_REVISION: 88679d7ebeeae4be30f43ebe88cba830f363803b
+        BOAT_ATTACK_REVISION: d07745c0d9bc97cde5fc4ae86186d6c2f0c2a16c
 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
+        UTR_VERSION: "current"
+        TEST_FILTER: .*
+        BOAT_ATTACK_BRANCH: master
+        BOAT_ATTACK_REVISION: d07745c0d9bc97cde5fc4ae86186d6c2f0c2a16c