Skip to content

Commit a5758e0

Browse files
authored
FIX: Fix functional test job in Trunk on iOS (#2217)
1 parent 6ada733 commit a5758e0

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.yamato/config.metadata

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ editors:
99
- version: 6000.2
1010
run_tvos: false
1111
- version: trunk
12+
run_ios_15: true
1213
run_tvos: false
1314

1415
utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat

.yamato/upm-ci.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
- move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
3636
- move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
3737
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
38-
- UnifiedTestRunner --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name == "functional" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
38+
- UnifiedTestRunner --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --clean-library --reruncount=1 --clean-library-on-rerun --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if platform.name == "win" and category.name == "functional" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
3939
{% if platform.name == "win" and category.name == "functional" %}
4040
# Delete the Package and Project reports & raw coverage data, to keep Artifacts.zip smaller
4141
- rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"
@@ -87,7 +87,7 @@
8787
- mv ./Packages/com.unity.inputsystem/Samples ./Assets
8888
- mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
8989
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
90-
- UnifiedTestRunner --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
90+
- UnifiedTestRunner --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --clean-library --reruncount=1 --clean-library-on-rerun --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %} {% if category.name == "functional" and platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project --coverage-upload-options="reportsDir:upm-ci~/test-results/CodeCoverage/Project;name:{{platform.name}}_{{editor.version}}_project;flags:{{platform.name}}_{{editor.version}}_project" {% endif %}
9191
{% if category.name == "functional" and platform.name == "mac" or platform.name == "linux"%}
9292
# Delete the Package and Project reports & raw coverage data, to keep Artifacts.zip smaller
9393
- rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package
@@ -120,9 +120,12 @@ build_ios_{{ editor.version }}_{{ category.name }}:
120120
variables:
121121
EDITOR_VERSION: {{ editor.version }}
122122
UTR_VERSION: 1.35.1
123+
{% if editor.run_ios_15 %}
124+
UNITY_HANDLEUIINTERRUPTIONS: 1
125+
{% endif %}
123126
commands:
124127
- unity-downloader-cli -c Editor -c iOS -u $EDITOR_VERSION --fast --wait
125-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
128+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
126129
after:
127130
- {{ instabilities_install_nix }}
128131
- {{ instabilities_run_mac }}
@@ -139,7 +142,11 @@ run_ios_{{ editor.version }}_{{ category.name }}:
139142
agent:
140143
type: Unity::mobile::iPhone
141144
image: {{ ios_and_tvos_macos_bokken_image }}
145+
{% if editor.run_ios_15 %}
146+
model: SE-Gen3
147+
{% else %}
142148
model: SE
149+
{% endif %}
143150
flavor: b1.medium
144151
variables:
145152
EDITOR_VERSION: {{ editor.version }}
@@ -149,7 +156,7 @@ run_ios_{{ editor.version }}_{{ category.name }}:
149156
dependencies:
150157
- .yamato/upm-ci.yml#build_ios_{{ editor.version }}_{{ category.name }}
151158
commands:
152-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
159+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=iOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
153160
after:
154161
- {{ instabilities_install_nix }}
155162
- {{ instabilities_run_mac }}
@@ -169,7 +176,7 @@ build_tvos_{{ editor.version }}_{{ category.name }}:
169176
UTR_VERSION: 1.35.1
170177
commands:
171178
- unity-downloader-cli -c Editor -c AppleTV -u $EDITOR_VERSION --fast --wait
172-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
179+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
173180
after:
174181
- {{ instabilities_install_nix }}
175182
- {{ instabilities_run_mac }}
@@ -195,7 +202,7 @@ run_tvos_{{ editor.version }}_{{ category.name }}:
195202
dependencies:
196203
- .yamato/upm-ci.yml#build_tvos_{{ editor.version }}_{{ category.name }}
197204
commands:
198-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
205+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=tvOS --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
199206
after:
200207
- {{ instabilities_install_nix }}
201208
- {{ instabilities_run_mac }}
@@ -217,7 +224,7 @@ build_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
217224
EDITOR_VERSION: {{ editor.version }}
218225
commands:
219226
- unity-downloader-cli -c Editor -c Android -u %EDITOR_VERSION% --fast --wait
220-
- UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository {% if category.name == "performance" %} --performance-project-id=InputSystem {% endif %}
227+
- UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only --repository {% if category.name == "performance" %} --performance-project-id=InputSystem {% endif %}
221228
after:
222229
- {{ instabilities_install_win }}
223230
- {{ instabilities_run_win }}
@@ -250,7 +257,7 @@ run_android_{{ editor.version }}_{{ backend.name }}_{{ category.name }}:
250257
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
251258
# List the connected devices
252259
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
253-
UnifiedTestRunner --suite=playmode {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=android --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
260+
UnifiedTestRunner --suite=playmode --clean-library --reruncount=1 --clean-library-on-rerun {% if category.name == "performance" %} --category=Performance {% else %} --category=!Performance {% endif %} --platform=android --player-load-path=build/players --artifacts_path=build/test-results {% if category.name == "performance" %} --report-performance-data --performance-project-id=InputSystem {% endif %}
254261
after:
255262
- start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
256263
- if not exist build\test-results mkdir build\test-results

0 commit comments

Comments
 (0)