Skip to content

Commit a779769

Browse files
EmandMEmandM
committed
fix: Yamato jobs not testing built player
1 parent e5f6047 commit a779769

8 files changed

Lines changed: 133 additions & 14 deletions

‎.yamato/cmb-service-standalone-tests.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}
6161
# run_cmb_service.sh builds and starts a release version of the full CMB service (along with the limited echo server)
6262
- ./Tools/CI/service.cmb/run_cmb_service.sh -e $ECHO_SERVER_PORT -s $CMB_SERVICE_PORT -l artifacts
6363

64-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}{% if backend == "coreclr" %}{% unless coreclr_runtime_editors contains editor %} -c {{ platform.coreclr_component }} {% endunless %}{% endif %} --arch {{ platform.architecture }}
65-
- 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 }}
64+
- UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --scripting-backend={{ backend }} --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --playergraphicsapi=Null --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --timeout={{ test_timeout }}
6665
artifacts:
6766
logs:
6867
paths:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
8888
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
8989
{% endif %}
9090
commands:
91-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }} --arch {{ platform.architecture }}
92-
- 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 }}
91+
- UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --scripting-backend=il2cpp --testproject={{ project.path }} --artifacts-path=test-results --player-load-path=build/players --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --timeout={{ test_timeout }}
9392
variables:
9493
# PS4 related
9594
SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00'

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
4949
{% endif %}
5050
commands:
5151
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}{% if backend == "coreclr" %}{% unless coreclr_runtime_editors contains editor %} -c {{ platform.coreclr_component }} {% endunless %}{% endif %} --arch {{ platform.architecture }}
52-
- 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 }}
52+
- UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --scripting-backend={{ backend }} --testfilter="Unity.Netcode.RuntimeTests.*;TestProject.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 }}
5353
artifacts:
5454
players:
5555
paths:
@@ -90,8 +90,7 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
9090
{% endif %}
9191

9292
commands:
93-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}{% if backend == "coreclr" %}{% unless coreclr_runtime_editors contains editor %} -c {{ platform.coreclr_component }} {% endunless %}{% endif %} --arch {{ platform.architecture }}
94-
- 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 }}
93+
- UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --scripting-backend={{ backend }} --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --playergraphicsapi=Null --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --timeout={{ test_timeout }}
9594
artifacts:
9695
logs:
9796
paths:

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
8282
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
8383
{% endif %}
8484
commands:
85-
# Installing editor. We still need the editor to run tests on standalone build and for that the Editor is required
86-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %} --arch {{ platform.architecture }}
87-
8885
{% if platform.standalone == "Android" %}
8986
# Download standalone UnityTestRunner and ADB setup
9087
- command: wget http://artifactory-slo.bf.unity3d.com/artifactory/mobile-generic/android/ADBKeys.zip!/adbkey.pub -O %USERPROFILE%/.android/adbkey.pub
@@ -97,11 +94,11 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
9794
# Run tests for Android devices
9895
- |
9996
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
100-
UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --player-connection-ip=%BOKKEN_HOST_IP% --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}
97+
UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --player-connection-ip=%BOKKEN_HOST_IP% --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --timeout={{ test_timeout }}
10198
{% else %}
10299

103100
# Run tests for non-Android devices
104-
- UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }} --device-id=%BOKKEN_DEVICE_ID%
101+
- UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --timeout={{ test_timeout }} --device-id=%BOKKEN_DEVICE_ID%
105102
{% endif %}
106103
artifacts:
107104
logs:

‎Tools/CI/service.cmb/run_cmb_service.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ cargo build --release --locked
171171
# The infinite loop is required as the service will exit each time all connected clients disconnect.
172172
# This means the service will exit after each test. The infinite loop will immediately restart the service each time it exits.
173173
logMessage "Running service integration tests..."
174-
echo "comb-server -l error --metrics-port 5000 standalone --port $service_port -t 60m --unity-version $unity_version"
174+
echo "comb-server -l warn -l ngo::session=info -l comb_server::session=info --metrics-port 5000 standalone --port $service_port -t 60m --unity-version $unity_version"
175175

176176
while :; do
177-
./target/release/comb-server -l error --metrics-port 5000 standalone --port $service_port -t 60m --unity-version $unity_version;
177+
./target/release/comb-server -l warn -l ngo::session=info -l comb_server::session=info --metrics-port 5000 standalone --port $service_port -t 60m --unity-version $unity_version;
178178
done & # <- use & to run the entire loop in the background

‎testproject/Assets/NetCodeConfig.asset‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: abd30ee0214cf6a45b2d76765a4615b1, type: 3}
13+
m_Name: NetCodeConfig
14+
m_EditorClassIdentifier: Unity.NetCode::Unity.NetCode.NetCodeConfig
15+
IsGlobalConfig: 1
16+
EnableClientServerBootstrap: 0
17+
HostWorldModeSelection: 1
18+
ClientServerTickRate:
19+
SimulationTickRate: 30
20+
PredictedFixedStepSimulationTickRatio: 1
21+
NetworkTickRate: 30
22+
MaxSimulationStepsPerFrame: 1
23+
MaxSimulationStepBatchSize: 4
24+
TargetFrameRateMode: 0
25+
m_SendSnapshotsForCatchUpTicks: 0
26+
SnapshotAckMaskCapacity: 4096
27+
m_ClampPartialTicksThreshold: 5
28+
HandshakeApprovalTimeoutMS: 5000
29+
ClientTickRate:
30+
InterpolationTimeNetTicks: 0
31+
InterpolationTimeMS: 50
32+
MaxExtrapolationTimeSimTicks: 20
33+
ForcedInputLatencyTicks: 0
34+
MaxPredictAheadTimeMS: 500
35+
NumAdditionalClientPredictedGhostLifetimeTicks: 0
36+
DefaultClassificationAllowableTickPeriod: 5
37+
TargetCommandSlack: 2
38+
NumAdditionalCommandsToSend: 2
39+
MaxPredictionStepBatchSizeRepeatedTick: 0
40+
MaxPredictionStepBatchSizeFirstTimeTick: 0
41+
AlwaysRollbackAllPredictedGhosts: 0
42+
PredictionLoopUpdateMode: 0
43+
InterpolationDelayJitterScale: 1.25
44+
InterpolationDelayMaxDeltaTicksFraction: 0.15
45+
InterpolationDelayCorrectionFraction: 0.1
46+
InterpolationTimeScaleMin: 0.9
47+
InterpolationTimeScaleMax: 1.33
48+
CommandAgeCorrectionFraction: 0.1
49+
PredictionTimeScaleMin: 0.9
50+
PredictionTimeScaleMax: 1.1
51+
GhostSendSystemData:
52+
DefaultSnapshotPacketSize: 15000
53+
PercentReservedForDespawnMessages: 0.2
54+
MinSendImportance: 0
55+
MinDistanceScaledSendImportance: 0
56+
MaxIterateChunks: 0
57+
MaxSendChunks: 0
58+
MaxSendEntities: 0
59+
m_ForceSingleBaseline: 0
60+
m_ForcePreSerialize: 0
61+
m_KeepSnapshotHistoryOnStructuralChange: 1
62+
m_EnablePerComponentProfiling: 0
63+
CleanupConnectionStatePerTick: 1
64+
m_FirstSendImportanceMultiplier: 1
65+
m_IrrelevantImportanceDownScale: 1
66+
m_TempStreamSize: 8192
67+
m_UseCustomSerializer: 0
68+
ConnectTimeoutMS: 1000
69+
MaxConnectAttempts: 60
70+
DisconnectTimeoutMS: 30000
71+
HeartbeatTimeoutMS: 500
72+
ReconnectionTimeoutMS: 2000
73+
ClientSendQueueCapacity: 128
74+
ClientReceiveQueueCapacity: 128
75+
ServerSendQueueCapacity: 512
76+
ServerReceiveQueueCapacity: 512
77+
MaxMessageSize: 1400
78+
TracingConfig:
79+
TracingMemoryLimitMb: 2048
80+
FuzzyFactor: 0.0001
81+
IgnoreDTDiffs: 0
82+
IgnorePartialTicks: 0

‎testproject/Assets/NetCodeConfig.asset.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎testproject/ProjectSettings/NetCodeClientAndServerSettings.asset‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 53
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 4111970df3904877aade1a474116e5c2, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier: Unity.NetCode.Authoring.Hybrid::Unity.NetCode.Hybrid.NetCodeClientAndServerSettings
15+
FilterSettings:
16+
ExcludedBakingSystemAssemblies: []
17+
AdditionalScriptingDefines: []
18+
GlobalNetcodeConfig: {fileID: 11400000, guid: c547acbddd81d32a0ba5e62ddfc4f4e3, type: 2}
19+
CurrentImportanceSuggestions:
20+
- MinValue: 1
21+
MaxValue: 4
22+
Name: Low Importance
23+
Tooltip: For cosmetic (i.e. visual-only) ghosts like glass bottles, signs, beach-balls, and cones etc. Typically <b>Static</b>.
24+
- MinValue: 5
25+
MaxValue: 40
26+
Name: Medium Importance
27+
Tooltip: For common gameplay-affecting ghosts like trees, doors, explosive barrels, dropped loot etc. Typically <b>Static</b>.
28+
- MinValue: 50
29+
MaxValue: 250
30+
Name: High Importance
31+
Tooltip: For per-player and objective-critical ghosts like Player Character Controllers and CTF flags etc. Typically for <b>Dynamic</b> i.e. <b>Predicted</b> ghosts. <b>UsePreSerialization</b> is likely a good fit.
32+
- MinValue: 1000
33+
MaxValue: 0
34+
Name: Critical Importance
35+
Tooltip: For gameplay critical singletons like the one keeping the current score, or the one denoting whether or not the current round has started etc. Choose <b>UsePreSerialization</b>, and use sparingly.

0 commit comments

Comments
 (0)