[10.x.x] Merge Hdrp/staging [Skip CI]

.yamato/all-hdrp.yml

@@ -12,6 +12,8 @@ All_HDRP_trunk:
          rerun: on-new-revision
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_trunk
          rerun: on-new-revision
+      -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_trunk
+         rerun: on-new-revision
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_trunk
          rerun: on-new-revision
       -  path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_trunk
@@ -32,6 +34,8 @@ All_HDRP_trunk:
          rerun: on-new-revision
       -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_trunk
          rerun: on-new-revision
+      -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_trunk
+         rerun: on-new-revision
       -  path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_trunk
          rerun: on-new-revision
 All_HDRP_fast-trunk:
@@ -43,6 +47,8 @@ All_HDRP_fast-trunk:
          rerun: on-new-revision
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_fast-trunk
          rerun: on-new-revision
+      -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_fast-trunk
+         rerun: on-new-revision
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_fast-trunk
          rerun: on-new-revision
       -  path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_fast-trunk
@@ -63,6 +69,8 @@ All_HDRP_fast-trunk:
          rerun: on-new-revision
       -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_fast-trunk
          rerun: on-new-revision
+      -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_fast-trunk
+         rerun: on-new-revision
       -  path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_fast-trunk
          rerun: on-new-revision
 All_HDRP_CUSTOM-REVISION:
@@ -74,6 +82,8 @@ All_HDRP_CUSTOM-REVISION:
          rerun: always
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_CUSTOM-REVISION
          rerun: always
+      -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_RenderGraph_CUSTOM-REVISION
+         rerun: always
       -  path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_CUSTOM-REVISION
          rerun: always
       -  path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_CUSTOM-REVISION
@@ -94,6 +104,8 @@ All_HDRP_CUSTOM-REVISION:
          rerun: always
       -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION
          rerun: always
+      -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_CUSTOM-REVISION
+         rerun: always
       -  path: .yamato/all-hdrp_hybrid.yml#All_HDRP_Hybrid_CUSTOM-REVISION
          rerun: always
     variables:

.yamato/all-hdrp_dxr.yml

@@ -10,19 +10,25 @@ All_HDRP_DXR_trunk:
          rerun: on-new-revision
       -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_trunk
          rerun: on-new-revision
+      -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_trunk
+         rerun: on-new-revision
 All_HDRP_DXR_fast-trunk:
     name: All HDRP_DXR CI - fast-trunk
     dependencies:
       -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_Standalone_fast-trunk
          rerun: on-new-revision
       -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_fast-trunk
          rerun: on-new-revision
+      -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_fast-trunk
+         rerun: on-new-revision
 All_HDRP_DXR_CUSTOM-REVISION:
     name: All HDRP_DXR CI - CUSTOM-REVISION
     dependencies:
       -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_Standalone_CUSTOM-REVISION
          rerun: always
       -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION
          rerun: always
+      -  path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_XR_CUSTOM-REVISION
+         rerun: always
     variables:
         CUSTOM_REVISION: custom_revision_not_set

.yamato/config/__shared.metafile

@@ -14,6 +14,7 @@ test_platforms:
   Standalone: --suite=playmode --platform=Standalone
   playmode: --suite=playmode
   playmode_XR: --suite=playmode --extra-editor-arg="-xr-tests"
+  playmode_RenderGraph: --suite=playmode --extra-editor-arg="-rendergraph-tests"
   editmode: --suite=editor --platform=editmode
 project_platforms:
   Win:

.yamato/config/hdrp.metafile

@@ -1,10 +1,11 @@
 project:
-  name: HDRP 
+  name: HDRP
   folder: HDRP_Tests
   folder_standalone: HDRP_RuntimeTests
 test_platforms:
   - playmode
   - playmode_XR
+  - playmode_RenderGraph
   - editmode
   - Standalone
 platforms:
@@ -36,11 +37,11 @@ platforms:
     components:
       - editor
       - il2cpp
-  - name: OSX 
+  - name: OSX
     apis:
       - Metal
   - name: Linux
-    apis: 
+    apis:
       - Vulkan
 all:
   dependencies:
@@ -50,6 +51,7 @@ all:
         - editmode
         - playmode
         - playmode_XR
+        - playmode_RenderGraph
         - Standalone
     - platform: Win
       api: DX12
@@ -72,11 +74,12 @@ all:
       api: Vulkan
       test_platforms:
         - editmode
-        - playmode        
+        - playmode
     - project: HDRP_DXR
       platform: Win
       api: DX12
       test_platforms:
         - playmode
+        - playmode_XR
     - project: HDRP_Hybrid
       all: true

.yamato/config/hdrp_dxr.metafile

@@ -4,6 +4,7 @@ project:
 test_platforms:
   - Standalone
   - playmode
+  - playmode_XR
 platforms:
   - name: Win
     os: windows
@@ -24,3 +25,4 @@ all:
       test_platforms:
         - Standalone
         - playmode
+        - playmode_XR

.yamato/hdrp-linux-vulkan.yml

@@ -24,6 +24,27 @@ HDRP_Linux_Vulkan_playmode_trunk:
         logs:
             paths:
               -  "**/test-results/**"
+HDRP_Linux_Vulkan_playmode_RenderGraph_trunk:
+    name: HDRP on Linux_Vulkan_playmode_RenderGraph on version trunk
+    agent:
+        type: Unity::VM::GPU
+        image: cds-ops/ubuntu-18.04-base:stable
+        flavor: b1.large
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:trunk:linux
+         rerun: on-new-revision
+    commands:
+      -  sudo -H pip install --upgrade pip
+      -  sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
+      -  cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp  --wait --published-only
+      -  cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan"
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
 HDRP_Linux_Vulkan_editmode_trunk:
     name: HDRP on Linux_Vulkan_editmode on version trunk
     agent:
@@ -87,6 +108,27 @@ HDRP_Linux_Vulkan_playmode_fast-trunk:
         logs:
             paths:
               -  "**/test-results/**"
+HDRP_Linux_Vulkan_playmode_RenderGraph_fast-trunk:
+    name: HDRP on Linux_Vulkan_playmode_RenderGraph on version fast-trunk
+    agent:
+        type: Unity::VM::GPU
+        image: cds-ops/ubuntu-18.04-base:stable
+        flavor: b1.large
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:fast-trunk:linux
+         rerun: on-new-revision
+    commands:
+      -  sudo -H pip install --upgrade pip
+      -  sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
+      -  cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp  --wait --published-only
+      -  cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan"
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
 HDRP_Linux_Vulkan_editmode_fast-trunk:
     name: HDRP on Linux_Vulkan_editmode on version fast-trunk
     agent:
@@ -151,6 +193,28 @@ HDRP_Linux_Vulkan_playmode_CUSTOM-REVISION:
         logs:
             paths:
               -  "**/test-results/**"
+HDRP_Linux_Vulkan_playmode_RenderGraph_CUSTOM-REVISION:
+    name: HDRP on Linux_Vulkan_playmode_RenderGraph on version CUSTOM-REVISION
+    agent:
+        type: Unity::VM::GPU
+        image: cds-ops/ubuntu-18.04-base:stable
+        flavor: b1.large
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: custom_revision_not_set
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:linux
+         rerun: always
+    commands:
+      -  sudo -H pip install --upgrade pip
+      -  sudo -H pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
+      -  git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
+      -  cd TestProjects/HDRP_Tests && sudo unity-downloader-cli --source-file ../../unity_revision.txt -c editor -c il2cpp  --wait --published-only
+      -  cd TestProjects/HDRP_Tests && DISPLAY=:0.0 utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-vulkan"
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
 HDRP_Linux_Vulkan_editmode_CUSTOM-REVISION:
     name: HDRP on Linux_Vulkan_editmode on version CUSTOM-REVISION
     agent:

.yamato/hdrp-osx-metal.yml

@@ -59,6 +59,34 @@ HDRP_OSX_Metal_playmode_XR_trunk:
         logs:
             paths:
               -  "**/test-results/**"
+HDRP_OSX_Metal_playmode_RenderGraph_trunk:
+    name: HDRP on OSX_Metal_playmode_RenderGraph on version trunk
+    agent:
+        type: Unity::metal::macmini
+        image: slough-ops/macos-10.14-xcode:stable
+        flavor: m1.mac
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:trunk:macos
+         rerun: on-new-revision
+    commands:
+      -  git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'"
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp  --wait --published-only'
+      -  |5-
+
+                 ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results'
+                 UTR_RESULT=$? 
+                 mkdir -p TestProjects/HDRP_Tests/test-results/
+                 scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/
+                 exit $UTR_RESULT
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
 HDRP_OSX_Metal_editmode_trunk:
     name: HDRP on OSX_Metal_editmode on version trunk
     agent:
@@ -171,6 +199,34 @@ HDRP_OSX_Metal_playmode_XR_fast-trunk:
         logs:
             paths:
               -  "**/test-results/**"
+HDRP_OSX_Metal_playmode_RenderGraph_fast-trunk:
+    name: HDRP on OSX_Metal_playmode_RenderGraph on version fast-trunk
+    agent:
+        type: Unity::metal::macmini
+        image: slough-ops/macos-10.14-xcode:stable
+        flavor: m1.mac
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:fast-trunk:macos
+         rerun: on-new-revision
+    commands:
+      -  git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'"
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp  --wait --published-only'
+      -  |5-
+
+                 ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results'
+                 UTR_RESULT=$? 
+                 mkdir -p TestProjects/HDRP_Tests/test-results/
+                 scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/
+                 exit $UTR_RESULT
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
 HDRP_OSX_Metal_editmode_fast-trunk:
     name: HDRP on OSX_Metal_editmode on version fast-trunk
     agent:
@@ -285,6 +341,35 @@ HDRP_OSX_Metal_playmode_XR_CUSTOM-REVISION:
         logs:
             paths:
               -  "**/test-results/**"
+HDRP_OSX_Metal_playmode_RenderGraph_CUSTOM-REVISION:
+    name: HDRP on OSX_Metal_playmode_RenderGraph on version CUSTOM-REVISION
+    agent:
+        type: Unity::metal::macmini
+        image: slough-ops/macos-10.14-xcode:stable
+        flavor: m1.mac
+    variables:
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: custom_revision_not_set
+    dependencies:
+      -  path: .yamato/_editor.yml#editor:priming:CUSTOM-REVISION:macos
+         rerun: always
+    commands:
+      -  git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/HDRP_Tests/utr
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade'"
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/Graphics
+      -  scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
+      -  ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp  --wait --published-only'
+      -  |5-
+
+                 ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_Tests && ~/Graphics/TestProjects/HDRP_Tests/utr/utr --suite=playmode --extra-editor-arg="-rendergraph-tests" --testproject=/Users/bokken/Graphics/TestProjects/HDRP_Tests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results'
+                 UTR_RESULT=$? 
+                 mkdir -p TestProjects/HDRP_Tests/test-results/
+                 scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_Tests/test-results/ TestProjects/HDRP_Tests/test-results/
+                 exit $UTR_RESULT
+    artifacts:
+        logs:
+            paths:
+              -  "**/test-results/**"
 HDRP_OSX_Metal_editmode_CUSTOM-REVISION:
     name: HDRP on OSX_Metal_editmode on version CUSTOM-REVISION
     agent: