corrected ppi usage

michalChrobot · michalChrobot · commit d873b2685d4b · 2026-01-14T16:31:39.000+01:00
diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml
@@ -39,13 +39,7 @@ code_coverage_{{ platform.name }}_{{ editor }}:
   variables:
     UTR_VERSION: {{ utr_version }}
   commands:
-{% if platform.name == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-    - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
     - upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor
     - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage coverage-upload-options="reportsDir:$PWD/test-results/CoverageResults;name:NGOv2_{{ platform.name }}_{{ editor }};flags:NGOv2_{{ platform.name }}_{{ editor }};verbose" --coverage-results-path=$PWD/test-results/CoverageResults --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout={{ test_timeout }} --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --artifacts-path=test-results
diff --git a/.yamato/console-standalone-test.yml b/.yamato/console-standalone-test.yml
@@ -50,7 +50,7 @@ console_standalone_build_{{ 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:
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }}
     - UnifiedTestRunner --testproject={{ project.path }} --architecture={% if platform.name == "switch" %}arm64{% else %}x64{% endif %} --scripting-backend=il2cpp --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --artifacts-path=artifacts --player-save-path=build/players --testfilter="Unity.Netcode.RuntimeTests.*" --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout={{ test_timeout}}
   variables:
@@ -90,7 +90,7 @@ console_standalone_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:
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }}
     - UnifiedTestRunner --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --artifacts-path=test-results --player-load-path=build/players --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}
   variables:
diff --git a/.yamato/desktop-standalone-tests.yml b/.yamato/desktop-standalone-tests.yml
@@ -43,13 +43,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
     model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}
   commands:
-{% if platform.name == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-    - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}
     - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --scripting-backend={{ backend }} --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --artifacts-path=artifacts --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout={{ test_timeout }}
   artifacts:
@@ -86,13 +80,7 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
 {% endif %}
 
   commands:
-{% if platform.name == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-    - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
     - UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}
   artifacts:
diff --git a/.yamato/mobile-standalone-test.yml b/.yamato/mobile-standalone-test.yml
@@ -54,11 +54,7 @@ mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
   variables:
     UNITY_HANDLEUIINTERRUPTIONS: 1
   commands:
-{% if platform.base == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.base == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %}
     - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --testproject={{ project.path }} --architecture={{ platform.architecture }} --scripting-backend=il2cpp --editor-location=.Editor --artifacts-path=artifacts --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout={{ test_timeout }}
   artifacts:
@@ -88,11 +84,7 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
 {% endif %}
   commands:
     # Installing editor. We still need the editor to run tests on standalone build and for that the Editor is required
-{% if platform.base == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.base == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %}
 
 {% if platform.standalone == "Android" %}
diff --git a/.yamato/package-pack.yml b/.yamato/package-pack.yml
@@ -42,13 +42,7 @@ package_pack_-_ngo_{{ platform.name }}:
   variables:
     XRAY_PROFILE: "gold ./pvpExceptions.json"
   commands:
-{% if platform.name == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-    - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - upm-pvp pack "com.unity.netcode.gameobjects" --output upm-ci~/packages
     - upm-pvp xray --packages "upm-ci~/packages/com.unity.netcode.gameobjects*.tgz" --results pvp-results
     - upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results --allow-missing
diff --git a/.yamato/package-tests.yml b/.yamato/package-tests.yml
@@ -39,13 +39,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
     XRAY_PROFILE: "gold ./pvpExceptions.json"
     UNITY_EXT_LOGGING: 1
   commands:
-{% if platform.name == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-    - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - 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.
diff --git a/.yamato/performance-tests.yml b/.yamato/performance-tests.yml
@@ -35,13 +35,7 @@ performance_editor_tests_-_NGO_{{ platform.name }}_{{ editor }}_no_data_reportin
     model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}
   commands:
-{% if platform.name == "win" %}
-      - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-      - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-      - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+      - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
       - unity-downloader-cli -u {{ editor }} -c Editor --wait {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor
       - UnifiedTestRunner --suite=editor --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --timeout=3600 --artifacts-path=artifacts --extra-editor-arg=-assemblyNames --extra-editor-arg=Unity.NetCode.* --extra-editor-arg=-testCategory --extra-editor-arg=Performance --extra-editor-arg=-enablePackageManagerTraces --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --dontreportperformancedata
       # TODO: when performance tests will be present we need to add actuall execution of this test
diff --git a/.yamato/project-builders/project-builders.yml b/.yamato/project-builders/project-builders.yml
@@ -32,7 +32,6 @@ build_{{ netcodeProject[0] }}_project:
     PLATFORM_WIN64_MAC_ANDROID: win64
     SAMPLE_BRANCH: {{ netcodeProject[1].defaultBranch }}
   commands:
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
     # Validate inputs passed via Yamato variables
     - python Tools/scripts/BuildAutomation/validate_params.py
     - echo Building {{ netcodeProject[0] }} project from branch %SAMPLE_BRANCH% with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID%
diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml
@@ -39,13 +39,7 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
   variables:
     UTR_VERSION: {{ utr_version }}
   commands:
-{% if platform.name == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-    - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - 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
     - UnifiedTestRunner --testproject={{ project.path }} --suite=editor --suite=playmode --artifacts-path=test-results --editor-location=.Editor --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}
   artifacts:
diff --git a/.yamato/project-updated-dependencies-test.yml b/.yamato/project-updated-dependencies-test.yml
@@ -35,13 +35,7 @@ updated-dependencies_{{ project.name }}_NGO_{{ 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:
-{% if platform.name == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-    - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - 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 test -u {{ editor }} --project-path {{ project.path }} --type updated-dependencies-tests --package-filter com.unity.netcode.gameobjects
   artifacts:
@@ -66,13 +60,7 @@ project_pack_-_{{ project.name }}_{{ platform.name }}:
     image: {{ platform.image }}
     flavor: {{ platform.flavor }}
   commands:
-{% if platform.name == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-    - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - 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 }}
   artifacts:
diff --git a/.yamato/webgl-build.yml b/.yamato/webgl-build.yml
@@ -37,13 +37,7 @@ webgl_build_{{ 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:
-{% if platform.name == "win" %}
-    - pinned-package-installer install -c Tools/CI/ppi-windows.yml
-{% elif platform.name == "mac" %}
-    - pinned-package-installer install -c Tools/CI/ppi-macos.yml
-{% elif platform.name == "ubuntu" %}
-    - pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
-{% endif %}
+    - pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c webgl -c il2cpp {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloading the editor with additional webgl and il2cpp components
 
     # The following step builds the player with defined options such as:
diff --git a/Tools/CI/ppi-mac.yml b/Tools/CI/ppi-mac.yml
diff --git a/Tools/CI/ppi-win.yml b/Tools/CI/ppi-win.yml
