chore: Small yamato tweaks to try speed up our PR trigger runs

Author: EmandM

.yamato/_triggers.yml

@@ -44,7 +44,7 @@
   # It's important to ensure that all dependencies exist (this can be verified in Yamato) since a modification in parameters may result in a given job not being generated, and thus we will not be able to run such erroneous job.
 
 
-#-----------------------------------------------------------------------------------  
+#-----------------------------------------------------------------------------------
 
 # After some experimenting with CI setups we discovered that even though sometimes we don't need CI to run (no reason to run package tests if only Documentation is changed) there are some checks that devs may not realize but changes in seemingly unrelated files will cause their failures
 # This trigger was created to ensure that ALL PRs run this minimal check even when we don't need to run full tests
@@ -82,7 +82,7 @@ pr_code_changes_checks:
 
     # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon
     # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
-    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_6000.0
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk
     - .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
   triggers:
     expression: |-
@@ -104,9 +104,9 @@ pr_code_changes_checks:
         "**/*.md"
       ]
     cancel_old_ci: true
-      
-      
-      
+
+
+
 
 
 

.yamato/package-pack.yml

@@ -29,7 +29,7 @@ package_pack_-_ngo_{{ platform.name }}:
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
-    flavor: {{ platform.flavor }}
+    flavor: {{ platform.smaller_flavor }}
 {% if platform.model %}
     model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}

.yamato/package-tests.yml

@@ -5,23 +5,23 @@
   # This job is responsible for execution of package-specific tests in Unity Editor context
   # Those tests cover both PlayMode and EditMode tests from package test assemblies
   # Additionally it combines Package Verification Pipeline (PVP) validation. This ensures that package is compatible with Unity standards
-  
+
 # CONFIGURATION STRUCTURE--------------------------------------------------------------
   # Jobs are generated using nested loops through:
     # 1. For all desktop platforms (Windows, Ubuntu, macOS)
     # 2. For all supported Unity Editor versions (for NGOv2.X this means 6000.0+ editors)
-  
+
 # TECHNICAL CONSIDERATIONS---------------------------------------------------------------
   # This job runs in Editor context only (no player builds required)
   # No scripting backend variations needed (Editor context)
   # Architecture variations not applicable (Editor context)
   # Requires project packaging as prerequisite (dependency job)
   # Uses PVP for package validation. Specifically it looks for supported profiles which we should conform to but takes ./pvpExceptions.json file into consideration where we note our known issues related to PVP checks
-  
+
 # QUALITY CONSIDERATIONS--------------------------------------------------------------------
   # To see where this job is included (in trigger job definitions) look into _triggers.yml file
   # TODO: we should aim to replace target PVP profile from supported to gold
-  
+
 #------------------------------------------------------------------------------------
 
 {% for platform in test_platforms.desktop -%}
@@ -31,7 +31,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
-    flavor: {{ platform.flavor }}
+    flavor: {{ platform.smaller_flavor }}
 {% if platform.model %}
     model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}
@@ -40,7 +40,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
     UNITY_EXT_LOGGING: 1
   commands:
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models.
-    
+
     # Validate PVP checks for package.
     - upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --results pvp-results
     - upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results
@@ -57,4 +57,4 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
     - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors
     - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
 {% endfor -%}
-{% endfor -%}
+{% endfor -%}

.yamato/project-pack.yml

@@ -4,22 +4,20 @@
 # DESCRIPTION--------------------------------------------------------------------------
   # This job is responsible for packing a specific project. It generates package artifacts (.tgz) required for testing and publishing, ensuring all dependencies are properly bundled and validated before any test execution.
   # The job itself doesn't test anything specific but rather it prepares project packages that will be consumed by other pipeline jobs.
-  
+
 # CONFIGURATION STRUCTURE--------------------------------------------------------------
   # Jobs configurations are generated using nested loops through:
     # 1. For all projects (testproject, minimalproject, testproject-tools-integration).
     # 2. For all desktop platforms (Win, Ubuntu, Mac)
-  
+
 # TECHNICAL CONSIDERATIONS--------------------------------------------------------------------
   # Job does not require Unity Editor in order to perform packing.
   # In theory, we could just use one platform for packing projects (for example ubuntu) but in order to reduce confusion we are using same platform as the job utilizing project pack as dependency.
-  
+
 # QUALITY CONSIDERATIONS--------------------------------------------------------------------
   # To see where this job is included (in trigger job definitions) look into _triggers.yml file
-  # TODO: Currently upm-ci is being used but in the future it will be replaced by upm-pvp. Additionally this would allow us to run PVP checks on projects
-  
-  
-#-------------------------------------------------------------------------------------- 
+
+#--------------------------------------------------------------------------------------
 
 {% for project in projects.all -%}
 {% for platform in test_platforms.desktop -%}
@@ -28,18 +26,17 @@ project_pack_-_{{ project.name }}_{{ platform.name }}:
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
-    flavor: {{ platform.flavor }}
+    flavor: {{ platform.smaller_flavor }}
 {% if platform.model %}
     model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it
-    - upm-ci project pack --project-path {{ project.path }}
+    - upm-pvp pack --project {{ project.path }} --output upm-ci~/packages
   dependencies:
     - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors
   artifacts:
     packages:
       paths:
         - "upm-ci~/packages/**/*"
 {% endfor -%}
-{% endfor -%}
+{% endfor -%}

.yamato/project-tests.yml

@@ -4,24 +4,23 @@
 # DESCRIPTION--------------------------------------------------------------------------
   # This job executes project-specific tests in Unity Editor context
   # Those tests cover both PlayMode and EditMode tests from project test assemblies
-  # NGO package tests are NOT being executed within this job (those are handled in separate package test jobs)
-  
+  # NGO package tests are NOT being executed within this job (those are handled in separate package test jobs) ??
+
 # CONFIGURATION STRUCTURE--------------------------------------------------------------
   # Jobs configurations are generated using nested loops through:
     # 1. For all projects WITH TESTS (filtered by has_tests flag) (testproject, testproject-tools-interation) [For more info look into project.metafile configuration]
     # 2. For all desktop platforms (Windows, Ubuntu, macOS)
     # 3. For all supported Unity Editor versions (for NGOv2.X this means 6000.0+ editors)
-  
+
 # TECHNICAL CONSIDERATIONS---------------------------------------------------------------
   # This job runs in Editor context only (no player builds is required)
   # No scripting backend variations needed (Editor context)
   # Architecture variations not applicable (Editor context)
   # Requires project packaging as prerequisite (dependency job)
-  
+
 # QUALITY CONSIDERATIONS--------------------------------------------------------------------
-  # TODO: Currently upm-ci is being used but in the future it will be replaced by upm-pvp
   # To see where this job is included (in trigger job definitions) look into _triggers.yml file
-  
+
 #------------------------------------------------------------------------------------
 
 {% for project in projects.all -%}
@@ -38,16 +37,13 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
     model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor for tests execution
-    - upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests --extra-utr-arg="--reruncount=1 --clean-library-on-rerun" # project tests execution via upm-ci
+    - UnifiedTestRunner --testproject={{ project.path }} --suite=editor --suite=playmode --artifacts-path=test-results --editor-location=.Editor --reruncount=1 --clean-library-on-rerun  --timeout=1800
   artifacts:
     logs:
       paths:
-        - "upm-ci~/test-results/**/*"
-  dependencies:
-    - .yamato/project-pack.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
+        - "test-results/**/*"
 {% endfor -%}
 {% endfor -%}
 {% endif -%}
-{% endfor -%}
+{% endfor -%}

.yamato/project.metafile

@@ -9,6 +9,7 @@
     # type --> Specifies the Bokken agent type (e.g., Unity::VM, Unity::VM::osx, Unity::mobile::shield)
     # image --> Defines the package-ci Bokken image to use for the environment (e.g., package-ci/ubuntu-22.04:v4). This is basically a device configuration
     # flavor --> Determines the VM size/resources (e.g., b1.small, b1.large, m1.mac)
+    # smaller_flavor --> An override for flavor that determines the VM size/resources for lighter weight jobs that can run on a smaller vm
     # standalone --> Specifies the build target platform (e.g., StandaloneLinux64, Android, IOS)
     # model --> Defines specific hardware model requirements (e.g., rtx2080, iPhone model 13). Notice that trunk currently (19.08.2025) has 13.0 as minimal iOS version which devices below this are not supporting
     # base --> Indicates the base operating system for build operations (e.g., win, mac)
@@ -45,18 +46,21 @@ test_platforms:
           type: Unity::VM
           image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
+          smaller_flavor: b1.medium
           standalone: StandaloneLinux64
           model: rtx2080
         - name: win
           type: Unity::VM
           image: package-ci/win10:v4
           flavor: b1.large
+          smaller_flavor: b1.medium
           standalone: StandaloneWindows64
           model: rtx2080
         - name: mac
           type: Unity::VM::osx
           image: package-ci/macos-13-arm64:v4 # ARM64 to support M1 model (below)
           flavor: m1.mac
+          smaller_flavor: m1.mac # mac doesn't have a smaller vm size. We define it anyway as it simplifies the yaml templating to have it defined.
           standalone: StandaloneOSX
           model: M1 # The default model (an x64 Intel Mac VM) quite often caused a known issue of doing all the bitflips in packages resulting in failures
     # For mobile devices there is a split between the build and run phase so there is a need of splitting specification for both