Updated desktop standalone tests and overall tests order

Author: michalChrobot

.yamato/desktop-standalone-tests.yml

@@ -4,18 +4,21 @@
 # Builds a player on desktop standalone platform and executes PlayMode tests of the NGO package in the Standalone build
 # Only Package tests are being executed in the context of the default project
 {% for project in projects.default -%}
-{% for editor in validation_editors.all -%}
 {% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
 {% for backend in scripting_backends -%}
 desktop_standalone_tests_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}:
-  name : Standalone Tests - NGO {{ project.name }} - [{{ platform.name }}, {{ backend }}, {{ editor }}]
+  name : Standalone Tests - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}]
   agent:
     type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }}::GPU {% endif %}
     image: {{ platform.image }}
     flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }}
+{% endif %}
   commands:
     # Installing tools
-{% if platform.name == "Ubuntu" %}
+{% if platform.name == "ubuntu" %}
     - sudo apt-get update -q
     - sudo apt install -qy imagemagick
 {% endif %}
@@ -24,7 +27,7 @@ desktop_standalone_tests_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
 
     # Platform specific UTR setup
     - |
-{% if platform.name == "Win" %}
+{% if platform.name == "win" %}
       curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
 {% else %}
       curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
@@ -35,16 +38,16 @@ desktop_standalone_tests_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
 
     # Build Player
     - |
-{% if platform.name == "Win" %}
-      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
+{% if platform.name == "win" %}
+      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
 {% else %}
       ./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 %} 
 
     # Run Standalone tests
     - |
-{% 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
+{% if platform.name == "win" %}
+      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
 {% 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 %}      

.yamato/package-tests.yml

@@ -2,8 +2,8 @@
 ---
 
 # Executes PlayMode and EditMode tests of the NGO package in the Editor context
-{% for editor in validation_editors.all -%}
 {% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
 package_test_-_ngo_{{ editor }}_{{ platform.name }}:
   name : Package Test - NGO [{{ platform.name }}, {{ editor }}]
   agent:

.yamato/project-standards.yml

@@ -4,8 +4,8 @@
 # Project standards are being checked for package (in project context)
 # It should be enough to perform the test on default project
 {% for platform in test_platforms.default -%}
+{% for project in projects.all -%}
 {% for editor in validation_editors.default -%}
-{% for project in projects.default -%}
 standards_{{ platform.name }}:
   name: Standards Check - NGO [{{ platform.name }}, {{ project.name }}]
   agent:

.yamato/project-tests.yml

@@ -4,8 +4,9 @@
 # Executes PlayMode and EditMode tests of the given project in the Editor context
 # Those tests don't include NGO package tests since they are handled on their respective jobs.
 {% for project in projects.all -%}
-{% for editor in validation_editors.all -%}
+{% if project.has_tests=="true" -%}
 {% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
 test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
   name : Project Test - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
   agent:
@@ -23,4 +24,5 @@ test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
     - .yamato/project-pack.yml#project_pack_-_{{ project.name }}
 {% endfor -%}
 {% endfor -%}
+{% endif -%}
 {% endfor -%}

.yamato/project.metafile

@@ -2,7 +2,7 @@
 # It uses ubuntu since Linux VMs are faster and cheaper to provision than Mac or Windows Virtual Machines (VMs).
 # The b1.small flavour is nearly always sufficient for jobs that don’t involve running Unity.
 small_agent: 
-    - name: Ubuntu
+    - name: ubuntu
       type: Unity::VM
       image: package-ci/ubuntu-22.04:v4
       flavor: b1.small
@@ -11,89 +11,101 @@ small_agent:
 test_platforms:
     # Default platform is used for all basic jobs. Ubuntu was chosen since it's fastest and most available
     default:
-        - name: Ubuntu
+        - name: ubuntu
           type: Unity::VM
           image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
           standalone: StandaloneLinux64
     # Desktop platforms cover all main desktop platforms
     desktop:  
-        - name: Ubuntu
+        - name: ubuntu
           type: Unity::VM
           image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
           standalone: StandaloneLinux64
-        - name: Win
+        - name: win
           type: Unity::VM
           image: package-ci/win10:v4
           flavor: b1.large
           standalone: StandaloneWindows64
-        - name: Mac
+        - name: mac
           type: Unity::VM::osx
           image: package-ci/macos-13:v4
           flavor: m1.mac
           standalone: StandaloneOSX
+          model: default
+        - name: mac-arm64
+          type: Unity::VM::osx
+          image: package-ci/macos-13-arm64:v4
+          flavor: m1.mac
+          standalone: StandaloneOSX
+          model: M1
+        - name: windows-arm64
+          type: Unity::VM::Azure
+          image: package-ci/win11-arm64:v4
+          flavor: b1.large
+          standalone: StandaloneWindows64
+          model: arm
     # 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
+        - name: android
           type: Unity::VM
           image: package-ci/win10:v4
           flavor: b1.large
           standalone: Android
-        - name: iOS
+        - name: ios
           type: Unity::VM::osx
           image: package-ci/macos-13:v4
           flavor: m1.mac
           standalone: IOS
     mobile_test:
-        - name: Android
+        - name: android
           type: Unity::mobile::shield
-          image: package-ci/win10:v4
+          image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
           model: ShieldPro
           standalone: Android
-        - name: iOS
+        - name: ios
           type: Unity::mobile::iPhone
           image: package-ci/macos-13:v4
           flavor: m1.mac
           model: SE
           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
+    console_no_split:
+        - name: nintendoSwitch
           type: Unity::console::switch
           image: package-ci/win10-switch:v4
           flavor: b1.large
           standalone: Switch
-        # Requires splitting
-        - name: XboxOne
-          type: Unity::console::xbox
-          image: package-ci/win10-xbox
-          flavor: b1.large
-          standalone: GameCoreXboxOne
-        - name: Ps4
+        - name: ps4
           type: Unity::console::ps4
           image: package-ci/win10-ps4
           flavor: b1.large
           standalone: PS4
-        # PS5 requires splitting like Android and IOS
-        - name: Ps5
+    console_build:
+        - name: xboxOne
+          type: Unity::console::xbox
+          image: package-ci/win10-xbox
+          flavor: b1.large
+          standalone: GameCoreXboxOne
+        - name: ps5
           type: Unity::console::ps5
           image: package-ci/win10-ps5
           flavor: b1.large
           standalone: PS5
-    Arm64:
-        - name: Mac-arm64
-          type: Unity::VM::osx
-          image: package-ci/macos-13-arm64:v4
-          flavor: m1.mac
-          model: M1
-        - name: Android-arm64
-          type: Unity::VM::Azure
-          image: package-ci/win11-arm64:v4
+    console_test:
+        - name: xboxOne
+          type: Unity::console::xbox
+          image: package-ci/win10-xbox
           flavor: b1.large
-          model: arm
+          standalone: GameCoreXboxOne
+        - name: ps5
+          type: Unity::console::ps5
+          image: package-ci/win10-ps5
+          flavor: b1.large
+          standalone: PS5
 
 # Editors to be used for testing.
 # Since NGOv2 official support started from U6 it means that only those editors should be used for testing

.yamato/webgl-build.yml

@@ -7,10 +7,10 @@
 # Default project in this case is used as a context.
 # WebGL requires Il2cpp scripting backend
 {% for project in projects.default -%}
+{% for platform in test_platforms.all -%}
 {% for editor in validation_editors.all -%}
-{% for platform in test_platforms.default -%}
 webgl_build_{{ project.name }}_{{ editor }}:
-  name: WebGl Build - [{{ project.name }}, {{ editor }}, il2cpp]
+  name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp]
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}