[Yamato] Enable cache server for standalone build jobs (#3106)

* create standalone_cache jobs

* use cache jobs for trunk verification

* fix commands so linux can recognise them

need to wrap each string around "extra-editor-arg"

Author: sophiaaar

.yamato/config/shadergraph.metafile

@@ -34,7 +34,7 @@ test_platforms:
     - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
     - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
 expression_trigger: 
-  expression: 'pull_request.target eq "<TARGET_BRANCH>" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
+  expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.shadergraph/**/*", "TestProjects/ShaderGraph/**/*"]'
 platforms:
   - name: Win
     apis:
@@ -44,28 +44,6 @@ platforms:
       - name: mono
     color_spaces:
       - Linear
-    agents_project:
-      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.large
-      standalone_cache:
-        type: Unity::VM::GPU
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-      standalone_build:
-        type: Unity::VM
-        image: sdet/gamecode_win10:stable
-        flavor: b1.xlarge
   - name: OSX
     apis:
       - name: Metal
@@ -180,4 +158,5 @@ nightly:
       build_config: il2cpp
       color_space: Linear
       test_platforms:
-        - Standalone_cache
+        - Standalone_cache
+    

.yamato/config/universal.metafile

@@ -1,96 +1,49 @@
 project:
   name: Universal
   folder: UniversalGraphicsTest
-
-reuse_blocks:
-  setup_with_utr:
-    - [Win_DX11, Win_DX12, Win_Vulkan, Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.turn_off_firewall>
-    - [Win_DX11, Win_DX12, Win_Vulkan]: cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080"
-    - [all]: <shared.platform.commands.setup_utr>
-    - [all]: <shared.platform.commands.unity_downloader_cli>
-    - [all]: <shared.platform.commands.call_utr>
-  setup_without_utr:
-    - [Win_DX11, Win_DX12, Win_Vulkan, Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.turn_off_firewall>
-    - [Win_DX11, Win_DX12, Win_Vulkan]: cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080"
-    - [all]: <shared.platform.commands.setup_utr>
-    - [all]: <shared.platform.commands.unity_downloader_cli>
-  cache_server:
+test_platforms:
+  - type: Standalone
+    utr_flags:
+      - [OSX_Metal]: --timeout=2400
+    utr_flags_build:
+      #- [Android_OpenGles3, Android_Vulkan]: --timeout=2700
+      #- [Win_DX11, Win_DX12, Win_Vulkan]: --timeout=2000
+      #- [iPhone_Metal]: --timeout=1800
+      - [all]: --timeout=3000
+  - type: playmode
+  - type: playmode
+    name: playmode_cache
+    utr_flags:
     - [all]: --extra-editor-arg="-adb2"
     - [all]: --extra-editor-arg="-enableCacheServer"
     - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com"
     - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP"
     - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
     - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
-
-test_platforms:
-  - type: Standalone
-    commands:
-      - [Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.connect_bokken>
-      - [Win_DX11, Win_DX12, Win_Vulkan, Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.turn_off_firewall>
-      - [Win_DX11, Win_DX12, Win_Vulkan]: cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080"
-      - [all]: <shared.platform.commands.setup_utr>
-      - [OSX_Metal]: <shared.platform.commands.unity_downloader_cli>
-      - [all]: <shared.platform.commands.call_utr>
-        flags:
-          - [OSX_Metal]: --timeout=2400
-      - [Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.kill_server>
-    commands_build:
-      - <reuse_blocks.setup_without_utr>
-      - [all]: <shared.platform.commands.call_utr>
-        flags:
-          - [all]: --timeout=3000
-  
-  - type: playmode
-    commands:
-      - <reuse_blocks.setup_with_utr>
-  - type: playmode
-    name: playmode_cache
-    commands: 
-      - <reuse_blocks.setup_without_utr>
-      - [all]: <shared.platform.commands.call_utr>
-        flags:
-          - <reuse_blocks.cache_server>
-  
   - type: editmode
-    commands:
-      - <reuse_blocks.setup_with_utr>
-  
   - type: playmode
     name: playmode_XR
-    commands: 
-      - <reuse_blocks.setup_without_utr>
-      - [all]: <shared.platform.commands.call_utr>
-        flags:
-          - [all]: --extra-editor-arg="-xr-reuse-tests"
-  - type: playmode
-    name: playmode_XR_cache
-    commands: 
-      - <reuse_blocks.setup_without_utr>
-      - [all]: <shared.platform.commands.call_utr>
-        flags:
-          - [all]: --extra-editor-arg="-xr-reuse-tests"
-          - <reuse_blocks.cache_server>
-
+    utr_flags:
+      - [all]: --extra-editor-arg="-xr-reuse-tests"
   - type: Standalone
     name: Standalone_cache
-    commands:
-      - [Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.connect_bokken>
-      - [Win_DX11, Win_DX12, Win_Vulkan, Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.turn_off_firewall>
-      - [Win_DX11, Win_DX12, Win_Vulkan]: cd Tools && powershell -command ". .\Unity.ps1; Set-ScreenResolution -width 1920 -Height 1080"
-      - [all]: <shared.platform.commands.setup_utr>
-      - [OSX_Metal]: <shared.platform.commands.unity_downloader_cli>
-      - [all]: <shared.platform.commands.call_utr>
-        flags:
-          - <reuse_blocks.cache_server>
-      - [Android_OpenGLES3, Android_Vulkan]: <shared.platform.commands.kill_server>
-    commands_build:
-      - <reuse_blocks.setup_without_utr>
-      - [all]: <shared.platform.commands.call_utr>
-        flags:
-          - [all]: --timeout=3000
-          - <reuse_blocks.cache_server>
+    utr_flags:
+    - [all]: --extra-editor-arg="-adb2"
+    - [all]: --extra-editor-arg="-enableCacheServer"
+    - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com"
+    - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP"
+    - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
+    - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
+    utr_flags_build:
+    - [all]: --timeout=3000
+    - [all]: --extra-editor-arg="-adb2"
+    - [all]: --extra-editor-arg="-enableCacheServer"
+    - [all]: --extra-editor-arg="-cacheServerEndpoint" --extra-editor-arg="cacheserver-slo.hq.unity3d.com"
+    - [all]: --extra-editor-arg="-cacheServerNamespacePrefix" --extra-editor-arg="SRP"
+    - [all]: --extra-editor-arg="-cacheServerEnableDownload" --extra-editor-arg="true"
+    - [all]: --extra-editor-arg="-cacheServerEnableUpload" --extra-editor-arg="true"
 expression_trigger:
-  expression: 'pull_request.target eq "<TARGET_BRANCH>" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"] AND NOT pull_request.push.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]'
+  expression: 'pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest/**/*"]'
 platforms:
   - name: Win
     apis:
@@ -101,28 +54,6 @@ platforms:
       - name: mono
     color_spaces:
       - Linear
-    agents_project:
-      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.large
-      standalone_cache:
-        type: Unity::VM::GPU
-        image: sdet/gamecode_win10:stable
-        flavor: b1.large
-      standalone_build:
-        type: Unity::VM
-        image: sdet/gamecode_win10:stable
-        flavor: b1.xlarge
   - name: OSX
     apis:
       - name: Metal
@@ -131,7 +62,6 @@ platforms:
       - name: OpenGLCore
         exclude_test_platforms:
           - name: playmode_XR
-          - name: playmode_XR_cache
           - name: Standalone
           - name: Standalone_cache
     build_configs:
@@ -145,11 +75,9 @@ platforms:
           - name: Standalone
           - name: Standalone_cache
           - name: playmode_XR
-          - name: playmode_XR_cache
       - name: Vulkan
         exclude_test_platforms:
           - name: playmode_XR
-          - name: playmode_XR_cache
     build_configs:
       - name: mono
     color_spaces:
@@ -161,14 +89,12 @@ platforms:
           - name: playmode
           - name: editmode
           - name: playmode_XR
-          - name: playmode_XR_cache
           - name: playmode_cache
       - name: Vulkan
         exclude_test_platforms:
           - name: playmode
           - name: editmode
           - name: playmode_XR
-          - name: playmode_XR_cache
           - name: playmode_cache
     build_configs:
       - name: il2cpp
@@ -181,7 +107,6 @@ platforms:
           - name: playmode
           - name: editmode
           - name: playmode_XR
-          - name: playmode_XR_cache
           - name: playmode_cache
     build_configs:
       - name: il2cpp
@@ -195,7 +120,7 @@ pr:
       color_space: Linear
       test_platforms:
         - Standalone_cache
-        - playmode_XR_cache
+        - playmode_XR
         - editmode
     - platform: Win
       api: DX12
@@ -298,17 +223,17 @@ nightly:
       color_space: Linear
       test_platforms:
         - playmode_cache
-        # - playmode_XR_cache
+        # - playmode_XR
     - platform: Win
       api: Vulkan
       build_config: mono
       color_space: Linear
       test_platforms:
         - playmode_cache
-        # - playmode_XR_cache
+        # - playmode_XR
     - platform: Linux
       api: Vulkan
       build_config: mono
       color_space: Linear
       test_platforms:
-        - playmode_cache
+        - playmode_cache