Skip to content

Commit 9f1e182

Browse files
committed
Merge branch 'fixing-disabled-tests-round1' of https://github.com/Unity-Technologies/com.unity.netcode.gameobjects into fixing-disabled-tests-round1
2 parents 0d0ef5a + 95f7b2f commit 9f1e182

File tree

9 files changed

+109
-105
lines changed

9 files changed

+109
-105
lines changed

.yamato/wrench/api-validation-jobs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
1313
type: Unity::VM
1414
flavor: b1.large
1515
commands:
16-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
16+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
1717
- command: 7z x -aoa wrench-localapv.zip
1818
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1919
- command: python PythonScripts/print_machine_info.py
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
5151
dependencies:
5252
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5353
variables:
54-
UPMPVP_CONTEXT_WRENCH: 0.10.41.0
54+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.10.41.0
57+
Wrench: 0.10.44.0
5858

.yamato/wrench/package-pack-jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 0.10.41.0
27+
Wrench: 0.10.44.0
2828

.yamato/wrench/preview-a-p-v.yml

Lines changed: 46 additions & 46 deletions
Large diffs are not rendered by default.

.yamato/wrench/promotion-jobs.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ publish_dry_run_netcode_gameobjects:
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
12-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
1313
- command: 7z x -aoa wrench-localapv.zip
1414
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1515
- command: python PythonScripts/print_machine_info.py
@@ -148,10 +148,10 @@ publish_dry_run_netcode_gameobjects:
148148
unzip: true
149149
variables:
150150
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
151-
UPMPVP_CONTEXT_WRENCH: 0.10.41.0
151+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
152152
metadata:
153153
Job Maintainers: '#rm-packageworks'
154-
Wrench: 0.10.41.0
154+
Wrench: 0.10.44.0
155155

156156
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
157157
publish_netcode_gameobjects:
@@ -161,7 +161,7 @@ publish_netcode_gameobjects:
161161
type: Unity::VM
162162
flavor: b1.large
163163
commands:
164-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-58_ab06748e39f9b01f55b979c0c06d7c1f787e07cbca4dc6ae5eef274fd195612a.zip -o wrench-localapv.zip
164+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
165165
- command: 7z x -aoa wrench-localapv.zip
166166
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
167167
- command: python PythonScripts/print_machine_info.py
@@ -300,8 +300,8 @@ publish_netcode_gameobjects:
300300
unzip: true
301301
variables:
302302
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
303-
UPMPVP_CONTEXT_WRENCH: 0.10.41.0
303+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
304304
metadata:
305305
Job Maintainers: '#rm-packageworks'
306-
Wrench: 0.10.41.0
306+
Wrench: 0.10.44.0
307307

.yamato/wrench/recipe-regeneration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test_-_wrench_jobs_up_to_date:
1111
commands:
1212
- command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
1313
- command: |-
14-
if [ -n "$(git status --porcelain -- .yamato/wrench)"]; then
14+
if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
1515
git status
1616
echo "Your repo is not clean - diff output:"
1717
git diff
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
2626
cancel_old_ci: true
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 0.10.41.0
29+
Wrench: 0.10.44.0
3030

.yamato/wrench/validation-jobs.yml

Lines changed: 45 additions & 45 deletions
Large diffs are not rendered by default.

.yamato/wrench/wrench_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
3333
"branch_pattern": "ReleaseSlash",
34-
"wrench_version": "0.10.41.0",
34+
"wrench_version": "0.10.44.0",
3535
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
3636
"cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
3737
}

Tools/CI/NGO.Cookbook.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.10.41" />
11+
<PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.10.44" />
1212
</ItemGroup>
1313

1414
</Project>

testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ public enum NetworkTransformSettings
158158

159159
protected override IEnumerator OnSetup()
160160
{
161+
//TODO: Remove this when we determine what the random failure is
162+
m_EnableVerboseDebug = true;
161163
TestComponentHelper.ClientsRegistered.Clear();
162164
TestComponentHelper.NetworkObjectIdToIndex.Clear();
163165
for (int i = 0; i < k_NestedChildren; i++)
@@ -169,6 +171,8 @@ protected override IEnumerator OnSetup()
169171

170172
protected override IEnumerator OnTearDown()
171173
{
174+
//TODO: Remove this when we determine what the random failure is
175+
m_EnableVerboseDebug = false;
172176
if (m_ServerSideParent != null && m_ServerSideParent.GetComponent<NetworkObject>().IsSpawned)
173177
{
174178
// Clean up in reverse order (also makes sure we can despawn parents before children)

0 commit comments

Comments
 (0)