Skip to content

Commit 2a4dcf5

Browse files
committed
Added backends to mobile standalone and increased webgl timeout
1 parent 1899860 commit 2a4dcf5

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

.yamato/mobile-standalone-test.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
{% for project in projects.default -%}
88
{% for editor in validation_editors.all -%}
99
{% for platform in test_platforms.mobile_build -%}
10-
build_{{ project.name }}_{{ editor }}_{{ platform.name }}:
11-
name: Build {{ project.name }} - [{{ editor }}, {{ platform.name }}]
10+
{% for backend in scripting_backends -%}
11+
build_{{ project.name }}_{{ editor }}_{{ platform.name }}_{{ backend }}:
12+
name: Build {{ project.name }} - [{{ editor }}, {{ platform.name }}, {{ backend }}]
1213
agent:
1314
type: {{ platform.type }}
1415
image: {{ platform.image }}
@@ -22,11 +23,11 @@ build_{{ project.name }}_{{ editor }}_{{ platform.name }}:
2223
{% if platform.name == "Android" %}
2324
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
2425
- python .yamato/disable-burst-if-requested.py --project-path {{ project.path }} --platform {{ platform.name }}
25-
- utr.bat --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend=mono --build-only --timeout=1800 --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
26+
- utr.bat --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend }} --build-only --timeout=1800 --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
2627
{% else %}
2728
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
2829
- chmod +x ./utr
29-
- ./utr --artifacts_path=artifacts --timeout=1800 --testproject={{ project.path }} --editor-location=.Editor --suite=playmode --platform={{ platform.standalone }} --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
30+
- ./utr --artifacts_path=artifacts --timeout=1800 --testproject={{ project.path }} --editor-location=.Editor --suite=playmode --platform={{ platform.standalone }} --scripting-backend={{ backend }} --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
3031
{% endif %}
3132

3233
artifacts:
@@ -48,14 +49,16 @@ build_{{ project.name }}_{{ editor }}_{{ platform.name }}:
4849
{% endfor -%}
4950
{% endfor -%}
5051
{% endfor -%}
52+
{% endfor -%}
5153

5254

5355
{% for project in projects.default -%}
5456
{% for editor in validation_editors.all -%}
5557
{% for platform in test_platforms.mobile_test -%}
5658
{% if platform.name == "Android" -%}
57-
run_{{ project.name }}_tests_{{ editor }}_Android:
58-
name: Run {{ project.name }} Tests - [{{ editor }}, Android]
59+
{% for backend in scripting_backends -%}
60+
run_{{ project.name }}_tests_{{ editor }}_Android_{{ backend }}:
61+
name: Run {{ project.name }} Tests - [{{ editor }}, Android, {{ backend }}]
5962
agent:
6063
type: {{ platform.type }}
6164
image: {{ platform.image }}
@@ -70,7 +73,7 @@ run_{{ project.name }}_tests_{{ editor }}_Android:
7073
- start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
7174
- start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
7275
# Run the tests on the device
73-
- ./utr --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-load-path=build/players --artifacts_path=build/logs --scripting-backend=mono --reruncount=1 --player-connection-ip=%BOKKEN_HOST_IP% --testfilter=Unity.Netcode.RuntimeTests
76+
- ./utr --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-load-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend }} --reruncount=1 --player-connection-ip=%BOKKEN_HOST_IP% --testfilter=Unity.Netcode.RuntimeTests
7477
artifacts:
7578
logs:
7679
paths:
@@ -85,6 +88,7 @@ run_{{ project.name }}_tests_{{ editor }}_Android:
8588
- build/players/**
8689
dependencies:
8790
- .yamato/mobile-standalone-test.yml#build_{{ project.name }}_{{ editor }}_Android
91+
{% endfor -%}
8892
{% endif -%}
8993
{% endfor -%}
9094
{% endfor -%}
@@ -95,8 +99,9 @@ run_{{ project.name }}_tests_{{ editor }}_Android:
9599
{% for editor in validation_editors.all -%}
96100
{% for platform in test_platforms.mobile_build -%}
97101
{% if platform.name == "iOS" -%}
98-
run_{{ project.name }}_tests_{{ editor }}_iOS:
99-
name: Run {{ project.name }} Tests - [{{ editor }}, iOS]
102+
{% for backend in scripting_backends -%}
103+
run_{{ project.name }}_tests_{{ editor }}_iOS_{{ backend }}:
104+
name: Run {{ project.name }} Tests - [{{ editor }}, iOS, {{ backend }}]
100105
agent:
101106
type: {{ platform.type }}
102107
image: {{ platform.image }}
@@ -107,7 +112,7 @@ run_{{ project.name }}_tests_{{ editor }}_iOS:
107112
# Give UTR execution permissions
108113
- chmod +x ./utr
109114
# Run the tests on the device
110-
- ./utr -artifacts_path=artifacts --testproject={{ project.path }} --editor-location=.Editor --reruncount=1 --suite=playmode --platform=iOS --player-load-path=build/players --testfilter=Unity.Netcode.RuntimeTests
115+
- ./utr -artifacts_path=artifacts --testproject={{ project.path }} --scripting-backend={{ backend }} --editor-location=.Editor --reruncount=1 --suite=playmode --platform=iOS --player-load-path=build/players --testfilter=Unity.Netcode.RuntimeTests
111116
artifacts:
112117
logs:
113118
paths:
@@ -123,6 +128,7 @@ run_{{ project.name }}_tests_{{ editor }}_iOS:
123128
# Set a dependency on the build job
124129
dependencies:
125130
- .yamato/mobile-standalone-test.yml#build_{{ project.name }}_{{ editor }}_iOS
131+
{% endfor -%}
126132
{% endif -%}
127133
{% endfor -%}
128134
{% endfor -%}

.yamato/webgl-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ webgl_build_{{ project.name }}_{{ editor }}:
3636
# Build Player
3737
- |
3838
{% if platform.name == "Win" %}
39-
utr.bat --suite=playmode --platform=WebGL --artifacts_path=build/test-results --timeout=1800 --testproject={{ project.path }} --editor-location=.Editor --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --scripting-backend=il2cpp --extra-editor-arg="-cloudEnvironment staging"
39+
utr.bat --suite=playmode --platform=WebGL --artifacts_path=build/test-results --timeout=2700 --testproject={{ project.path }} --editor-location=.Editor --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --scripting-backend=il2cpp --extra-editor-arg="-cloudEnvironment staging"
4040
{% else %}
41-
./utr --suite=playmode --platform=WebGL --artifacts_path=build/test-results --timeout=1800 --testproject={{ project.path }} --editor-location=.Editor --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --scripting-backend=il2cpp --extra-editor-arg="-cloudEnvironment staging"
41+
./utr --suite=playmode --platform=WebGL --artifacts_path=build/test-results --timeout=2700 --testproject={{ project.path }} --editor-location=.Editor --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --scripting-backend=il2cpp --extra-editor-arg="-cloudEnvironment staging"
4242
{% endif %}
4343

4444
artifacts:

0 commit comments

Comments
 (0)