Re-enabled ps5 and webgl

Author: michalChrobot

.yamato/console-standalone-test.yml

@@ -31,7 +31,6 @@
     # Each console requires specific SDK paths and tools
 
 # QUALITY THOUGHTS--------------------------------------------------------------------
-  # TODO: consider adding all projects that have tests
   # To see where this job is included (in trigger job definitions) look into _triggers.yml file
 
 
@@ -55,12 +54,12 @@ 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 --> 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'
+# PS5 related --> playstation/ps5-buildandexecute image ships SDK 13.000.
+    SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\13.000'
+    SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\host_tools\bin'
     SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'
 # Switch related
-    NINTENDO_SDK_ROOT: 'C:\Nintendo\nx_sdk-18_3_0\NintendoSDK'
+    NINTENDO_SDK_ROOT: 'C:\Nintendo\nx_sdk-22_2_0\NintendoSDK'
     UNITY_NINTENDOSDK_CLI_TOOLS: '${NINTENDO_SDK_ROOT}\Tools\CommandLineTools'
   artifacts:
     players:
@@ -94,12 +93,12 @@ 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 --> 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'
+# PS5 related --> playstation/ps5-buildandexecute image ships SDK 13.000.
+    SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\13.000'
+    SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\host_tools\bin'
     SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'
 # Switch related
-    NINTENDO_SDK_ROOT: 'C:\Nintendo\nx_sdk-18_3_0\NintendoSDK'
+    NINTENDO_SDK_ROOT: 'C:\Nintendo\nx_sdk-22_2_0\NintendoSDK'
     UNITY_NINTENDOSDK_CLI_TOOLS: '${NINTENDO_SDK_ROOT}\Tools\CommandLineTools'
   artifacts:
     logs:

.yamato/project.metafile

@@ -111,23 +111,19 @@ test_platforms:
           flavor: b1.large
           larger_flavor: b1.xlarge
           standalone: PS4
-        # - name: ps5 --> SEE MTT-12118
-        #  type: Unity::VM
-        #  image: package-ci/win10-ps5:v4
-        #  flavor: b1.large
-        #  larger_flavor: b1.xlarge
-        #  standalone: PS5
-        # - name: switch --> TEMPORARILY DISABLED. SEE MTT-12118
-        #   The NintendoSDK on the win10-switch:v4 Bokken image is incomplete for the SDK
-        #   version the newer editor Playback Engines require: 18_3_0 is missing the
-        #   nintendo-switch-support lib the new toolchain links against, and 21_4_3 is missing the
-        #   Tools\Graphics\NvnTools (GraphicsConverter) libraries needed to package textures.
-        #   Neither is fixable from .yamato; re-enable once Package CI ships a complete SDK on the image.
-        #   type: Unity::VM
-        #   image: package-ci/win10-switch:v4
-        #   flavor: b1.large
-        #   larger_flavor: b1.xlarge
-        #   standalone: Switch
+        # ps5 uses the PlayStation team image (SDK 13.000); package-ci/win10-ps5:v4 only ships SDK 9.00.
+        - name: ps5
+          type: Unity::VM
+          image: playstation/ps5-buildandexecute:v10.8.7
+          flavor: b1.large
+          larger_flavor: b1.xlarge
+          standalone: PS5
+        - name: switch
+          type: Unity::VM
+          image: package-ci/win10-switch:v4
+          flavor: b1.large
+          larger_flavor: b1.xlarge
+          standalone: Switch
         - name: GameCoreXboxOne
           type: Unity::VM
           image: package-ci/win10-xbox:v4
@@ -147,19 +143,19 @@ test_platforms:
           flavor: b1.large
           larger_flavor: b1.xlarge
           standalone: PS4
-        #- name: ps5 --> SEE MTT-12118
-        #  type:  Unity::console::ps5
-        #  image: package-ci/win10-ps5:v4
-        #  flavor: b1.large
-        #  larger_flavor: b1.xlarge
-        #  standalone: PS5
-        # - name: switch --> TEMPORARILY DISABLED. SEE MTT-12118 (incomplete NintendoSDK on win10-switch:v4 image)
-        #   type: Unity::console::switch
-        #   image: package-ci/win10-switch:v4
-        #   flavor: b1.large
-        #   larger_flavor: b1.xlarge
-        #   standalone: Switch
-        #   base: win
+        - name: ps5
+          type: Unity::console::ps5
+          image: playstation/ps5-buildandexecute:v10.8.7
+          flavor: b1.large
+          larger_flavor: b1.xlarge
+          standalone: PS5
+        - name: switch
+          type: Unity::console::switch
+          image: package-ci/win10-switch:v4
+          flavor: b1.large
+          larger_flavor: b1.xlarge
+          standalone: Switch
+          base: win
         - name: GameCoreXboxOne
           type: Unity::console::xbox
           image: package-ci/win10-xbox:v4