Corrected linter and naming for standalone desktop and webgl

Author: michalChrobot

.yamato/desktop-standalone-tests.yml

@@ -32,32 +32,18 @@ desktop_standalone_tests_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
     # Build Player
     - |
 {% if platform.name == "win" %}
-      utr.bat \
+      utr.bat --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend }} --build-only --testfilter=Unity.Netcode.RuntimeTests --extra-editor-arg=-batchmode --extra-editor-arg=-nographics
 {% else %}
-      ./utr \
+      ./utr --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend }} --build-only --testfilter=Unity.Netcode.RuntimeTests --extra-editor-arg=-batchmode --extra-editor-arg=-nographics
 {% endif %} 
-      --suite=playmode \
-      --platform={{ platform.standalone }} \
-      --editor-location=.Editor \
-      --testproject={{ project.path }} \
-      --player-save-path=build/players \
-      --artifacts_path=build/logs \
-      --scripting-backend={{ backend }} \
-      --build-only \
-      --testfilter=Unity.Netcode.RuntimeTests \
-      --extra-editor-arg=-batchmode \
-      --extra-editor-arg=-nographics
 
     # Run Standalone tests
     - |
-      {% if platform.name != "win" %}./{% endif %}utr \
-      --suite=playmode \
-      --platform={{ platform.standalone }} \
-      --player-load-path=build/players \
-      --artifacts_path=build/test-results \
-      --scripting-backend={{ backend }} \
-      --testfilter=Unity.Netcode.RuntimeTests \
-      --playergraphicsapi=Null
+{% if platform.name == "win" %}
+      utr.bat --suite=playmode --platform={{ platform.standalone }} --player-load-path=build/players --artifacts_path=build/test-results --scripting-backend={{ backend }} --testfilter=Unity.Netcode.RuntimeTests --playergraphicsapi=Null
+{% else %}
+      ./utr --suite=playmode --platform={{ platform.standalone }} --player-load-path=build/players --artifacts_path=build/test-results --scripting-backend={{ backend }} --testfilter=Unity.Netcode.RuntimeTests --playergraphicsapi=Null
+{% endif %}      
 
   artifacts:
     logs:

.yamato/project.metafile

@@ -15,74 +15,74 @@ test_platforms:
           type: Unity::VM
           image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
-          platform: StandaloneLinux64
+          standalone: StandaloneLinux64
     # Desktop platforms cover all main desktop platforms
     desktop:  
         - name: ubuntu
           type: Unity::VM
           image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
-          platform: StandaloneLinux64
+          standalone: StandaloneLinux64
         - name: win
           type: Unity::VM
           image: package-ci/win10:v4
           flavor: b1.large
-          platform: StandaloneWindows64
+          standalone: StandaloneWindows64
         - name: mac
           type: Unity::VM::osx
           image: package-ci/macos-13:v4
           flavor: m1.mac
-          platform: StandaloneOSX
+          standalone: StandaloneOSX
     # Mobile platforms cover all main mobile devices. There is a split between the build and run phase so there is a need of splitting specification for both (since its different)
     mobile_build:
         # It would be simpler to build android app with ubuntu but the option with windows was chosen since it covers more users
         - name: android
           type: Unity::VM
           image: package-ci/win10:v4
           flavor: b1.large
-          platform: Android
+          standalone: Android
         - name: ios
           type: Unity::VM::osx
           image: mobile-ci/ios:stable
           flavor: m1.mac
-          platform: IOS
+          standalone: IOS
     mobile_test:
         - name: android
           type: Unity::mobile::shield
           image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
           model: ShieldPro
-          platform: Android
+          standalone: Android
         - name: ios
           type: Unity::mobile::iPhone
           image: package-ci/macos-13:v4
           flavor: m1.mac
           model: SE
-          platform: IOS
+          standalone: IOS
     # We should test on at least one more "exotic" platform. Nintendo Switch was chosen as it represents broadly console platforms
     console:
         - name: nintendoSwitch
           type: Unity::console::switch
           image: package-ci/win10-switch:v4
           flavor: b1.large
-          platform: Switch
+          standalone: Switch
         # Requires splitting
         - name: xboxOne
           type: Unity::console::xbox
           image: package-ci/win10-xbox
           flavor: b1.large
-          platform: GameCoreXboxOne
+          standalone: GameCoreXboxOne
         - name: ps4
           type: Unity::console::ps4
           image: package-ci/win10-ps4
           flavor: b1.large
-          platform: PS4
+          standalone: PS4
         # PS5 requires splitting like Android and IOS
         - name: ps5
           type: Unity::console::ps5
           image: package-ci/win10-ps5
           flavor: b1.large
-          platform: PS5
+          standalone: PS5
     Arm64:
         - name: mac-arm64
           type: Unity::VM::osx

.yamato/webgl-build.yml

@@ -36,22 +36,10 @@ webgl_build_{{ project.name }}_{{ editor }}:
     # Build Player
     - |
 {% if platform.name == "win" %}
-      utr.bat \
+      utr.bat --suite=playmode --platform=WebGL --artifacts_path=build/test-results --timeout=1800 --testproject={{ project.path }} --editor-location=.Editor --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --scripting-backend=il2cpp --extra-editor-arg="-cloudEnvironment staging"
 {% else %}
-      ./utr \
+      ./utr --suite=playmode --platform=WebGL --artifacts_path=build/test-results --timeout=1800 --testproject={{ project.path }} --editor-location=.Editor --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --scripting-backend=il2cpp --extra-editor-arg="-cloudEnvironment staging"
 {% endif %}
-      --suite=playmode \
-      --platform=WebGL \
-      --artifacts_path=build/test-results \
-      --timeout=1800 \
-      --testproject={{ project.path }} \
-      --editor-location=.Editor \
-      --build-only \
-      --player-save-path=build/players\
-      --extra-editor-arg=-batchmode \
-      --extra-editor-arg=-nographics \
-      --scripting-backend=il2cpp \
-      --extra-editor-arg="-cloudEnvironment staging"
 
   artifacts:
     logs: