Skip to content

Commit 1a7b466

Browse files
michalChrobotmichalChrobot
committed
Revert "corrected ppi usage"
This reverts commit d873b26.
1 parent d873b26 commit 1a7b466

13 files changed

+83
-14
lines changed

‎.yamato/code-coverage.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ code_coverage_{{ platform.name }}_{{ editor }}:
3939
variables:
4040
UTR_VERSION: {{ utr_version }}
4141
commands:
42-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
42+
{% if platform.name == "win" %}
43+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
44+
{% elif platform.name == "mac" %}
45+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
46+
{% elif platform.name == "ubuntu" %}
47+
- pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
48+
{% endif %}
4349
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
4450
- upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor
4551
- 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

‎.yamato/console-standalone-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5050
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
5151
{% endif %}
5252
commands:
53-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
53+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
5454
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }}
5555
- 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}}
5656
variables:
@@ -90,7 +90,7 @@ console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
9090
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
9191
{% endif %}
9292
commands:
93-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
93+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
9494
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }}
9595
- 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 }}
9696
variables:

‎.yamato/desktop-standalone-tests.yml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
4343
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
4444
{% endif %}
4545
commands:
46-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
46+
{% if platform.name == "win" %}
47+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
48+
{% elif platform.name == "mac" %}
49+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
50+
{% elif platform.name == "ubuntu" %}
51+
- pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
52+
{% endif %}
4753
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}
4854
- 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 }}
4955
artifacts:
@@ -80,7 +86,13 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
8086
{% endif %}
8187

8288
commands:
83-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
89+
{% if platform.name == "win" %}
90+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
91+
{% elif platform.name == "mac" %}
92+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
93+
{% elif platform.name == "ubuntu" %}
94+
- pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
95+
{% endif %}
8496
- 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
8597
- 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 }}
8698
artifacts:

‎.yamato/mobile-standalone-test.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5454
variables:
5555
UNITY_HANDLEUIINTERRUPTIONS: 1
5656
commands:
57-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
57+
{% if platform.base == "win" %}
58+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
59+
{% elif platform.base == "mac" %}
60+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
61+
{% endif %}
5862
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %}
5963
- 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 }}
6064
artifacts:
@@ -84,7 +88,11 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
8488
{% endif %}
8589
commands:
8690
# Installing editor. We still need the editor to run tests on standalone build and for that the Editor is required
87-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
91+
{% if platform.base == "win" %}
92+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
93+
{% elif platform.base == "mac" %}
94+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
95+
{% endif %}
8896
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %}
8997

9098
{% if platform.standalone == "Android" %}

‎.yamato/package-pack.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@ package_pack_-_ngo_{{ platform.name }}:
4242
variables:
4343
XRAY_PROFILE: "gold ./pvpExceptions.json"
4444
commands:
45-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
45+
{% if platform.name == "win" %}
46+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
47+
{% elif platform.name == "mac" %}
48+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
49+
{% elif platform.name == "ubuntu" %}
50+
- pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
51+
{% endif %}
4652
- upm-pvp pack "com.unity.netcode.gameobjects" --output upm-ci~/packages
4753
- upm-pvp xray --packages "upm-ci~/packages/com.unity.netcode.gameobjects*.tgz" --results pvp-results
4854
- upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results --allow-missing

‎.yamato/package-tests.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
3939
XRAY_PROFILE: "gold ./pvpExceptions.json"
4040
UNITY_EXT_LOGGING: 1
4141
commands:
42-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
42+
{% if platform.name == "win" %}
43+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
44+
{% elif platform.name == "mac" %}
45+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
46+
{% elif platform.name == "ubuntu" %}
47+
- pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
48+
{% endif %}
4349
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models.
4450

4551
# Validate PVP checks for package.

‎.yamato/performance-tests.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ performance_editor_tests_-_NGO_{{ platform.name }}_{{ editor }}_no_data_reportin
3535
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3636
{% endif %}
3737
commands:
38-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
38+
{% if platform.name == "win" %}
39+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
40+
{% elif platform.name == "mac" %}
41+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
42+
{% elif platform.name == "ubuntu" %}
43+
- pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
44+
{% endif %}
3945
- unity-downloader-cli -u {{ editor }} -c Editor --wait {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor
4046
- 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
4147
# TODO: when performance tests will be present we need to add actuall execution of this test

‎.yamato/project-builders/project-builders.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ build_{{ netcodeProject[0] }}_project:
3232
PLATFORM_WIN64_MAC_ANDROID: win64
3333
SAMPLE_BRANCH: {{ netcodeProject[1].defaultBranch }}
3434
commands:
35+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
3536
# Validate inputs passed via Yamato variables
3637
- python Tools/scripts/BuildAutomation/validate_params.py
3738
- 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%

‎.yamato/project-tests.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,13 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3939
variables:
4040
UTR_VERSION: {{ utr_version }}
4141
commands:
42-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
42+
{% if platform.name == "win" %}
43+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
44+
{% elif platform.name == "mac" %}
45+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
46+
{% elif platform.name == "ubuntu" %}
47+
- pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
48+
{% endif %}
4349
- 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
4450
- 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 }}
4551
artifacts:

‎.yamato/project-updated-dependencies-test.yml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ editor }}:
3535
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3636
{% endif %}
3737
commands:
38-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
38+
{% if platform.name == "win" %}
39+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
40+
{% elif platform.name == "mac" %}
41+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
42+
{% elif platform.name == "ubuntu" %}
43+
- pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
44+
{% endif %}
3945
- 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
4046
- upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type updated-dependencies-tests --package-filter com.unity.netcode.gameobjects
4147
artifacts:
@@ -60,7 +66,13 @@ project_pack_-_{{ project.name }}_{{ platform.name }}:
6066
image: {{ platform.image }}
6167
flavor: {{ platform.flavor }}
6268
commands:
63-
- pinned-package-installer install -c Tools/CI/ppi-{{ platform.name }}.yml
69+
{% if platform.name == "win" %}
70+
- pinned-package-installer install -c Tools/CI/ppi-windows.yml
71+
{% elif platform.name == "mac" %}
72+
- pinned-package-installer install -c Tools/CI/ppi-macos.yml
73+
{% elif platform.name == "ubuntu" %}
74+
- pinned-package-installer install -c Tools/CI/ppi-ubuntu.yml
75+
{% endif %}
6476
- 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
6577
- upm-ci project pack --project-path {{ project.path }}
6678
artifacts:

0 commit comments

Comments
 (0)