diff --git a/.yamato/package-pack.yml b/.yamato/package-pack.yml index 4777c61f4d..69b782514c 100644 --- a/.yamato/package-pack.yml +++ b/.yamato/package-pack.yml @@ -13,11 +13,11 @@ package_pack_-_ngo_{{ platform.name }}: flavor: {{ platform.flavor }} timeout: 0.25 variables: - XRAY_PROFILE: "supported rme ./pvpExceptions.json" + XRAY_PROFILE: "supported ./pvpExceptions.json" commands: - 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 "$XRAY_PROFILE" --results pvp-results --allow-missing + - upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results --allow-missing artifacts: packages: paths: diff --git a/.yamato/package-tests.yml b/.yamato/package-tests.yml index 68a58dbf0e..13064fbbc9 100644 --- a/.yamato/package-tests.yml +++ b/.yamato/package-tests.yml @@ -20,7 +20,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}: - unity-downloader-cli -u {{ editor }} -c Editor --fast --wait # Validate packages. - upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --results pvp-results - - upm-pvp require "%XRAY_PROFILE%" --results pvp-results + - upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results # Run UTR to test packages. - upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor - {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %} {% if platform.name != "win" %} ./utr {% else %} UnifiedTestRunner {% endif %} --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --artifacts-path=test-results "--ff={ops.upmpvpevidence.enable=true}" --extra-editor-arg=-testCategory --extra-editor-arg=!Performance --reruncount=1 --clean-library-on-rerun