Skip to content

Commit 6650434

Browse files
authored
[10.x.x] Add --timeout flag to iOS URP jobs (#2128)
* Add timeout flag for iPhone tests * Run build.py to update iOS runners with timeout
1 parent d601a32 commit 6650434

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

.yamato/config/universal.metafile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ test_platforms:
77
OSX_Metal: 2400
88
timeout_build:
99
Android: 1800
10+
iOS: 1800
1011
Win: 2000
1112
- type: playmode
1213
- type: editmode

.yamato/ruamel/jobs/projects/commands/iphone.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from ...shared.constants import TEST_PROJECTS_DIR, PATH_UNITY_REVISION, PATH_TEST_RESULTS, PATH_PLAYERS, UTR_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, get_unity_downloader_cli_cmd
1+
from ...shared.constants import TEST_PROJECTS_DIR, PATH_UNITY_REVISION, PATH_TEST_RESULTS, PATH_PLAYERS, UTR_INSTALL_URL, UNITY_DOWNLOADER_CLI_URL, get_unity_downloader_cli_cmd, get_timeout
22
from ruamel.yaml.scalarstring import PreservedScalarString as pss
33
from ...shared.utr_utils import utr_editmode_flags, utr_playmode_flags, utr_standalone_split_flags,utr_standalone_not_split_flags, utr_standalone_build_flags
44

@@ -16,6 +16,7 @@ def cmd_standalone(project_folder, platform, api, test_platform, editor):
1616

1717
utr_args = utr_standalone_split_flags(platform_spec='', platform='iOS', player_load_path='players',player_conn_ip=None)
1818
utr_args.extend(test_platform["extra_utr_flags"])
19+
utr_args.append(f'--timeout={get_timeout(test_platform, "iOS")}')
1920

2021
return [
2122
f'curl -s {UTR_INSTALL_URL} --output utr',
@@ -28,6 +29,7 @@ def cmd_standalone_build(project_folder, platform, api, test_platform, editor):
2829

2930
utr_args = utr_standalone_build_flags(platform_spec='', platform='iOS', testproject=f'{TEST_PROJECTS_DIR}/{project_folder}', player_save_path=PATH_PLAYERS)
3031
utr_args.extend(test_platform["extra_utr_flags_build"])
32+
utr_args.append(f'--timeout={get_timeout(test_platform, "iOS", build=True)}')
3133

3234
return [
3335
f'pip install unity-downloader-cli --index-url {UNITY_DOWNLOADER_CLI_URL} --upgrade',

.yamato/universal-iphone-metal.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Universal_iPhone_Metal_Standalone_trunk:
1414
commands:
1515
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output utr
1616
- chmod +x ./utr
17-
- ./utr --suite=playmode --platform=iOS --artifacts_path=test-results --player-load-path=players --reruncount=2
17+
- ./utr --suite=playmode --platform=iOS --artifacts_path=test-results --player-load-path=players --reruncount=2 --timeout=1200
1818
artifacts:
1919
logs:
2020
paths:
@@ -37,7 +37,7 @@ Build_Universal_iPhone_Metal_Player_trunk:
3737
- unity-downloader-cli -u dc4a46d1cb369a5194a18beceb09063206b35c43 -c editor -c iOS --wait --published-only
3838
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output utr
3939
- chmod +x ./utr
40-
- ./utr --suite=playmode --platform=iOS --testproject=TestProjects/UniversalGraphicsTest --editor-location=.Editor --artifacts_path=test-results --player-save-path=players --build-only
40+
- ./utr --suite=playmode --platform=iOS --testproject=TestProjects/UniversalGraphicsTest --editor-location=.Editor --artifacts_path=test-results --player-save-path=players --build-only --timeout=1800
4141
artifacts:
4242
logs:
4343
paths:
@@ -57,7 +57,7 @@ Universal_iPhone_Metal_Standalone_2020.2:
5757
commands:
5858
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output utr
5959
- chmod +x ./utr
60-
- ./utr --suite=playmode --platform=iOS --artifacts_path=test-results --player-load-path=players --reruncount=2
60+
- ./utr --suite=playmode --platform=iOS --artifacts_path=test-results --player-load-path=players --reruncount=2 --timeout=1200
6161
artifacts:
6262
logs:
6363
paths:
@@ -80,7 +80,7 @@ Build_Universal_iPhone_Metal_Player_2020.2:
8080
- unity-downloader-cli -u 1b1252580c6429d4be5b5e88fafea90645240c65 -c editor -c iOS --wait --published-only
8181
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output utr
8282
- chmod +x ./utr
83-
- ./utr --suite=playmode --platform=iOS --testproject=TestProjects/UniversalGraphicsTest --editor-location=.Editor --artifacts_path=test-results --player-save-path=players --build-only
83+
- ./utr --suite=playmode --platform=iOS --testproject=TestProjects/UniversalGraphicsTest --editor-location=.Editor --artifacts_path=test-results --player-save-path=players --build-only --timeout=1800
8484
artifacts:
8585
logs:
8686
paths:
@@ -101,7 +101,7 @@ Universal_iPhone_Metal_Standalone_CUSTOM-REVISION:
101101
commands:
102102
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output utr
103103
- chmod +x ./utr
104-
- ./utr --suite=playmode --platform=iOS --artifacts_path=test-results --player-load-path=players --reruncount=2
104+
- ./utr --suite=playmode --platform=iOS --artifacts_path=test-results --player-load-path=players --reruncount=2 --timeout=1200
105105
artifacts:
106106
logs:
107107
paths:
@@ -127,7 +127,7 @@ Build_Universal_iPhone_Metal_Player_CUSTOM-REVISION:
127127
- unity-downloader-cli --source-file unity_revision.txt -c editor -c iOS --wait --published-only
128128
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output utr
129129
- chmod +x ./utr
130-
- ./utr --suite=playmode --platform=iOS --testproject=TestProjects/UniversalGraphicsTest --editor-location=.Editor --artifacts_path=test-results --player-save-path=players --build-only
130+
- ./utr --suite=playmode --platform=iOS --testproject=TestProjects/UniversalGraphicsTest --editor-location=.Editor --artifacts_path=test-results --player-save-path=players --build-only --timeout=1800
131131
artifacts:
132132
logs:
133133
paths:

0 commit comments

Comments
 (0)