Merge branch 'develop-2.0.0' into fix/cmb-service-compatibility-update-fixes

Author: NoelStephensUnity

.yamato/console-standalone-test.yml

@@ -55,7 +55,7 @@ console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
   variables:
 # PS4 related
     SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00'
-# PS5 related
+# PS5 related --> THIS WAS DISABLED IN PROJECT.METAFILE. SEE MTT-12118
     SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\9.000'
     SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\target\bins'
     SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'
@@ -94,7 +94,7 @@ console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
   variables:
 # PS4 related
     SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00'
-# PS5 related
+# PS5 related --> THIS WAS DISABLED IN PROJECT.METAFILE. SEE MTT-12118
     SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\9.000'
     SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\target\bins'
     SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'

.yamato/project.metafile

@@ -99,11 +99,11 @@ test_platforms:
           image: package-ci/win10-ps4:v4
           flavor: b1.large
           standalone: PS4
-        - name: ps5
-          type: Unity::VM
-          image: package-ci/win10-ps5:v4
-          flavor: b1.large
-          standalone: PS5
+        # - name: ps5 --> SEE MTT-12118
+        #  type: Unity::VM
+        #  image: package-ci/win10-ps5:v4
+        #  flavor: b1.large
+        #  standalone: PS5
         - name: switch
           type: Unity::VM
           image: package-ci/win10-switch:v4
@@ -125,11 +125,11 @@ test_platforms:
           image: package-ci/win10-ps4:v4
           flavor: b1.large
           standalone: PS4
-        - name: ps5
-          type:  Unity::console::ps5
-          image: package-ci/win10-ps5:v4
-          flavor: b1.large
-          standalone: PS5
+        #- name: ps5 --> SEE MTT-12118
+        #  type:  Unity::console::ps5
+        #  image: package-ci/win10-ps5:v4
+        #  flavor: b1.large
+        #  standalone: PS5
         - name: switch
           type: Unity::console::switch
           image: package-ci/win10-switch:v4