Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .yamato/_run-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -369,14 +369,14 @@ run_all_project_tests_console_standalone_default:


# Runs all unified (NGO + N4E) tests
# These run on their own pinned editor (unified_editors) rather than the validation_editors, because
# These run on their own pinned editor (validation_editors) rather than the validation_editors, because
# they need an editor that bundles a com.unity.netcode with the unified API. See unified-tests.yml.
run_all_unified_tests:
name: Run All Unified Tests
dependencies:
{% for project in projects.default -%}
{% for platform in unified_test_platforms -%}
{% for editor in unified_editors.default -%}
{% for platform in test_platforms.default -%}
{% for editor in validation_editors.default -%}
- .yamato/unified-tests.yml#unified_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
{% endfor -%}
{% endfor -%}
Expand Down
2 changes: 1 addition & 1 deletion .yamato/cmb-service-standalone-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}
# run_cmb_service.sh builds and starts a release version of the full CMB service (along with the limited echo server)
- ./Tools/CI/service.cmb/run_cmb_service.sh -e $ECHO_SERVER_PORT -s $CMB_SERVICE_PORT -l artifacts

- 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
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% 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:
logs:
Expand Down
4 changes: 2 additions & 2 deletions .yamato/desktop-standalone-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +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:
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp
- 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:
players:
Expand Down Expand Up @@ -79,7 +79,7 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
{% endif %}

commands:
- 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
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% 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:
logs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
# This is an auto-generated script. Do not edit manually!
set -x

crashReportDir="${TMPDIR%/}/BugReporterCrashReportJson"
if [ -d "$crashReportDir" ]; then
for f in "$crashReportDir"/CrashReport_*.json; do
[ -e "$f" ] || continue
curl -X POST --connect-timeout 5 --max-time 10 -H "Content-Type: application/json" -T "$f" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo "Failed to upload $f. Ignoring..."
done
fi
set -e
if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
echo "removed existing archive infrastructure_instability_detection_standalone.zip"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@echo on
rem This is an auto-generated script. Do not edit manually!

if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\*.json"') do curl -X POST -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring...
if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\CrashReport_*.json"') do curl -X POST --connect-timeout 5 --max-time 10 -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring...
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('infrastructure_instability_detection_standalone.zip', '.'); }" && DEL "infrastructure_instability_detection_standalone.zip"
Expand Down
44 changes: 7 additions & 37 deletions .yamato/project.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -172,50 +172,20 @@ test_platforms:
standalone: GameCoreScarlett

# EDITOR CONFIGURATIONS-------------------------------------------------------------------------------
# Editors to be used for testing. NGOv2.X official support started from 6000.0 editor
# Editors to be used for testing. NGOv3.X official support started from 6000.7 editor
# TODO: When a new editor will be released it should be added to this list

validation_editors:
default:
- 6000.6
- 6000.7
all:
- 6000.6.0b5
- 6000.6
- 6000.7.0a6
- 6000.7
- trunk
- 5fe7931aab8c4fff9274e15ef0800125c68b8d6a
- 1d47644d0e359a8139ae6f99217da3c4e47f4779
minimal:
- 6000.6.0b5
pinnedTrunk: 5fe7931aab8c4fff9274e15ef0800125c68b8d6a


# UNIFIED (NGO + N4E) CONFIGURATION---------------------------------------------------------------------
# The unified test job validates NGO running against Netcode for Entities (N4E) through the unified API.
# It is deliberately kept separate from every other job in this repo because it needs an editor that
# bundles com.unity.netcode with the unified API, and that editor is NOT one of the validation_editors.
#
# WHY THIS IS PINNED TO 6000.7.0a5 (and not 6000.7.0a2):
# UnifiedNetcodeTransport is compiled behind "#if UNIFIED_NETCODE && OUT_OF_BAND_RPC" and needs the
# N4E out-of-band RPC API (IOutOfBandRpcCommand / OutgoingOutOfBandRpcDataStreamBuffer).
# Both 6000.7.0a2 and 6000.7.0a5 bundle com.unity.netcode 6.7.0, but that API only landed in the a5
# snapshot. On a2 the unified transport does not compile, so the unified tests cannot run there.
# Bump this pin (and unified_netcode_version below) together whenever the required N4E API moves.
#
# An explicit alpha version is used instead of a trunk revision hash because published alphas are
# already immutable, so there is nothing to pin against.
unified_editors:
default:
- 6000.7.0a5

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was removed as it's covered by minimal editor now


# Version of com.unity.netcode (N4E) bundled with unified_editors.default.
# It resolves as a "builtin" package out of the editor install, so it must match the editor exactly.
unified_netcode_version: 6.7.0

# The unified job runs in Editor context only, so a single fast platform is enough.
unified_test_platforms:

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed as it's the same as default test platform

- name: ubuntu
type: Unity::VM
image: package-ci/ubuntu-22.04:v4.87.0
flavor: b1.large
- 6000.7.0a6
pinnedTrunk: 1d47644d0e359a8139ae6f99217da3c4e47f4779


# Scripting backends used by Standalone RunTimeTests---------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions .yamato/unified-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#------------------------------------------------------------------------------------

{% for project in projects.default -%}
{% for platform in unified_test_platforms -%}
{% for editor in unified_editors.default -%}
{% for platform in test_platforms.default -%}
{% for editor in validation_editors.default -%}
unified_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
name : Unified Test - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
agent:
Expand Down
17 changes: 9 additions & 8 deletions .yamato/wrench/api-validation-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@
all_api_validation_jobs:
name: All API Validation Jobs
dependencies:
- path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_win10
- path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_7_-_win10

# upm-ci validation tests for API Validation - netcode.gameobjects - 6000.0 - win10 (6000.0 - Windows).
api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
name: API Validation - netcode.gameobjects - 6000.0 - win10
# upm-ci validation tests for API Validation - netcode.gameobjects - 6000.7 - win10 (6000.7 - Windows).
api_validation_-_netcode_gameobjects_-_6000_7_-_win10:
name: API Validation - netcode.gameobjects - 6000.7 - win10
agent:
image: package-ci/win10:v4
type: Unity::VM
flavor: b1.large
commands:
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
- command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip
- command: 7z x -aoa wrench-localapv.zip
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
- command: python PythonScripts/print_machine_info.py
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
timeout: 20
retries: 10
- command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
timeout: 10
retries: 3
- command: python PythonScripts/PackageJsonCondersor.py
Expand Down Expand Up @@ -60,8 +60,9 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 3.3.1.0
UPMPVP_CONTEXT_WRENCH: 3.11.0.0
WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-15_84f461813aada1be64b3885e7b9464e7f92445674e81d708813ac0bdf2c90408.zip
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 3.3.1.0
Wrench: 3.11.0.0

3 changes: 2 additions & 1 deletion .yamato/wrench/package-pack-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ package_pack_-_netcode_gameobjects:
- upm-ci~/packages/**/*
variables:
UPMCI_ACK_LARGE_PACKAGE: 1
WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-15_84f461813aada1be64b3885e7b9464e7f92445674e81d708813ac0bdf2c90408.zip
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 3.3.1.0
Wrench: 3.11.0.0

Loading
Loading