Skip to content

Commit 3ad0739

Browse files
ci: [Backport] Fixing WebGL timeout and reenabling macOS job (#3511)
This PR is a backport of #3507 This PR focuses on investigating often timeouts of WebGL job happening on Ubuntu platform (note that there are no timeouts on Windows) and also on re-enabling macOS job that was disabled due to error "_Light baking could not be started because no valid OpenCL device could be found_" and is tracked in MTT-11726 When it comes to the error on macOS, the build was failing due to a light baking error in different scenes with message "_no valid OpenCL device could be found._" This common issue on Apple Silicon VMs, where OpenCL support is often missing for the GPU lightmapper, can be resolved by disabling "Baked Global Illumination" for the scene. Since those scenes in testproject do not really need baked lighting and I didn't spot any difference with this option disabled I went forward with disabling it for testproject scenes and this resolves macOS issue. **Note** that most changes are related to testproject updates that happened automatically when I changed the mentioned lighting setting For the Ubuntu timeout problem I restored image version to v4 instead of pointing to specific version since the issue that caused us to do so was resolved. I also increased flavor to xlarge (from large) because it seems that with more resources the process is not hanging anymore (will run test 5 times to confirm) ## Backport #3507
1 parent 7a81722 commit 3ad0739

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1641
-3161
lines changed

.yamato/_run-all.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,9 @@ run_all_webgl_builds:
109109
dependencies:
110110
{% for project in projects.default -%}
111111
{% for platform in test_platforms.desktop -%}
112-
{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
113112
{% for editor in validation_editors.all -%}
114113
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
115114
{% endfor -%}
116-
{% endif -%}
117115
{% endfor -%}
118116
{% endfor -%}
119117

@@ -124,11 +122,9 @@ run_all_webgl_builds_trunk:
124122
dependencies:
125123
{% for project in projects.default -%}
126124
{% for platform in test_platforms.desktop -%}
127-
{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
128125
{% for editor in validation_editors.default -%}
129126
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
130127
{% endfor -%}
131-
{% endif -%}
132128
{% endfor -%}
133129
{% endfor -%}
134130

@@ -138,9 +134,7 @@ run_all_webgl_builds_2021:
138134
dependencies:
139135
{% for project in projects.default -%}
140136
{% for platform in test_platforms.desktop -%}
141-
{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
142137
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_2021.3
143-
{% endif -%}
144138
{% endfor -%}
145139
{% endfor -%}
146140

.yamato/project.metafile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test_platforms:
3737
default:
3838
- name: ubuntu
3939
type: Unity::VM
40-
image: package-ci/ubuntu-22.04:v4.71.0
40+
image: package-ci/ubuntu-22.04:v4
4141
flavor: b1.large
4242
standalone: StandaloneLinux64
4343
desktop:

.yamato/webgl-build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525

2626
{% for project in projects.default -%}
2727
{% for platform in test_platforms.desktop -%}
28-
{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
2928
{% for editor in validation_editors.all -%}
3029
webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3130
name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp]
3231
agent:
3332
type: {{ platform.type }}
3433
image: {{ platform.image }}
35-
flavor: {{ platform.flavor }}
34+
flavor: b1.xlarge # We use b1.xlarge for WebGL builds since it requires more resources (otherwise it timeouts) especially on Ubuntu platform
3635
{% if platform.model %}
3736
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3837
{% endif %}
@@ -52,6 +51,5 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5251
- "artifacts/**/*"
5352
- "build/players/**/*"
5453
{% endfor -%}
55-
{% endif -%}
5654
{% endfor -%}
5755
{% endfor -%}

testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.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/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
@@ -97,7 +96,8 @@ LightmapSettings:
9796
m_ExportTrainingData: 0
9897
m_TrainingDataDestination: TrainingData
9998
m_LightProbeSampleCountMultiplier: 4
100-
m_LightingDataAsset: {fileID: 0}
99+
m_LightingDataAsset: {fileID: 112000000, guid: 2b418fd84f1bc394bb55e9d87e533782,
100+
type: 2}
101101
m_LightingSettings: {fileID: 0}
102102
--- !u!196 &4
103103
NavMeshSettings:
@@ -199,6 +199,7 @@ Canvas:
199199
m_OverrideSorting: 0
200200
m_OverridePixelPerfect: 0
201201
m_SortingBucketNormalizedSize: 0
202+
m_VertexColorAlwaysGammaSpace: 0
202203
m_AdditionalShaderChannelsFlag: 0
203204
m_SortingLayerID: 0
204205
m_SortingOrder: 0

testproject/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject/LightingData.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/Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject/ReflectionProbe-0.exr.meta

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

testproject/Assets/Samples/Physics/PhysicsSample.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/Assets/Samples/Physics/PhysicsSample.unity

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
@@ -97,7 +96,8 @@ LightmapSettings:
9796
m_ExportTrainingData: 0
9897
m_TrainingDataDestination: TrainingData
9998
m_LightProbeSampleCountMultiplier: 4
100-
m_LightingDataAsset: {fileID: 0}
99+
m_LightingDataAsset: {fileID: 112000000, guid: 29d2c44a6e01063478e1b9a607c770c6,
100+
type: 2}
101101
m_LightingSettings: {fileID: 4890085278179872738, guid: 7b34956cf0a136c4f8438c8ec088925e,
102102
type: 2}
103103
--- !u!196 &4
@@ -836,6 +836,7 @@ Canvas:
836836
m_OverrideSorting: 0
837837
m_OverridePixelPerfect: 0
838838
m_SortingBucketNormalizedSize: 0
839+
m_VertexColorAlwaysGammaSpace: 0
839840
m_AdditionalShaderChannelsFlag: 0
840841
m_SortingLayerID: 0
841842
m_SortingOrder: 0
@@ -1532,6 +1533,7 @@ Canvas:
15321533
m_OverrideSorting: 0
15331534
m_OverridePixelPerfect: 0
15341535
m_SortingBucketNormalizedSize: 0
1536+
m_VertexColorAlwaysGammaSpace: 0
15351537
m_AdditionalShaderChannelsFlag: 0
15361538
m_SortingLayerID: 0
15371539
m_SortingOrder: 0
@@ -1685,13 +1687,16 @@ MonoBehaviour:
16851687
m_Name:
16861688
m_EditorClassIdentifier:
16871689
GlobalObjectIdHash: 3834378536
1690+
InScenePlacedSourceGlobalObjectIdHash: 0
16881691
AlwaysReplicateAsRoot: 0
16891692
SynchronizeTransform: 1
16901693
ActiveSceneSynchronization: 0
16911694
SceneMigrationSynchronization: 1
16921695
SpawnWithObservers: 1
16931696
DontDestroyWithOwner: 0
16941697
AutoObjectParentSync: 1
1698+
SyncOwnerTransformWhenParented: 1
1699+
AllowOwnerToParent: 0
16951700
--- !u!114 &1431888136
16961701
MonoBehaviour:
16971702
m_ObjectHideFlags: 0
Binary file not shown.

testproject/Assets/Samples/Physics/PhysicsSample/LightingData.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.
Binary file not shown.

0 commit comments

Comments
 (0)