Added base and extension fields

Author: michalChrobot

.yamato/desktop-standalone-tests.yml

@@ -18,7 +18,7 @@ desktop_standalone_tests_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
 {% endif %}
   commands:
     # Installing tools
-{% if platform.name | downcase contains "ubuntu" %}
+{% if platform.base == "ubuntu" %}
     - sudo apt-get update -q
     - sudo apt install -qy imagemagick
 {% endif %}
@@ -27,30 +27,30 @@ desktop_standalone_tests_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
 
     # Platform specific UTR setup
     - |
-{% if platform.name | downcase contains "win" %}
+{% if platform.base == "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
 {% endif %}
 
     # Installing editor
-{% if platform.name | downcase contains "arm64" %}
+{% if platform.extension == "arm64" %}
     - unity-downloader-cli --arch arm64 -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} --fast --wait
 {% else %}
     - unity-downloader-cli -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} --fast --wait
 {% endif %}
 
     # Build Player
     - |
-{% if platform.name | downcase contains "win" %}
+{% if platform.base == "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 | downcase contains "win" %}
+{% if platform.base == "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

.yamato/project.metafile

@@ -16,36 +16,48 @@ test_platforms:
           image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
           standalone: StandaloneLinux64
+          base: ubuntu
+          extension: default
     # Desktop platforms cover all main desktop platforms
     desktop:  
         - name: ubuntu
           type: Unity::VM
           image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
           standalone: StandaloneLinux64
+          base: ubuntu
+          extension: default
         - name: win
           type: Unity::VM
           image: package-ci/win10:v4
           flavor: b1.large
           standalone: StandaloneWindows64
+          base: win
+          extension: default
         - name: mac
           type: Unity::VM::osx
           image: package-ci/macos-13:v4
           flavor: m1.mac
           standalone: StandaloneOSX
           model: default
+          base: mac
+          extension: default
         - name: mac-arm64
           type: Unity::VM::osx
           image: package-ci/macos-13-arm64:v4
           flavor: m1.mac
           standalone: StandaloneOSX
           model: M1
+          base: mac
+          extension: arm64
         - name: windows-arm64
           type: Unity::VM::Azure
           image: package-ci/win11-arm64:v4
           flavor: b1.large
           standalone: StandaloneWindows64
           model: arm
+          base: win
+          extension: arm64
     # 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

.yamato/webgl-build.yml

@@ -21,7 +21,7 @@ webgl_build_{{ project.name }}_{{ platform }}_{{ editor }}:
 
     # Platform specific UTR setup
     - |
-{% if platform.name == "Win" %}
+{% if platform.base == "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,7 +35,7 @@ webgl_build_{{ project.name }}_{{ platform }}_{{ editor }}:
 
     # Build Player
     - |
-{% if platform.name == "Win" %}
+{% if platform.base == "win" %}
       utr.bat --suite=playmode --platform=WebGL --artifacts_path=build/test-results --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 --suite=playmode --platform=WebGL --artifacts_path=build/test-results --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"