Skip to content

Commit 77b19df

Browse files
windxu88windxu88
committed
Fix ios and tvos jobs
1 parent 683767b commit 77b19df

8 files changed

+78
-12
lines changed

‎.yamato/input-system-mobile-functional-build-jobs.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ inputsystem-mobilefunctionalbuildjobs_-_2021_3_-_tvos:
7373
flavor: m1.mac
7474
commands:
7575
- command: unity-downloader-cli -u 2021.3/staging -c Editor -c AppleTV --fast --wait
76-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
76+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
7777
after:
7878
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
7979
artifacts:
@@ -157,7 +157,7 @@ inputsystem-mobilefunctionalbuildjobs_-_2022_3_-_tvos:
157157
flavor: m1.mac
158158
commands:
159159
- command: unity-downloader-cli -u 2022.3/staging -c Editor -c AppleTV --fast --wait
160-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
160+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
161161
after:
162162
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
163163
artifacts:
@@ -241,7 +241,7 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_tvos:
241241
flavor: m1.mac
242242
commands:
243243
- command: unity-downloader-cli -u 6000.0/staging -c Editor -c AppleTV --fast --wait
244-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
244+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
245245
after:
246246
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
247247
artifacts:
@@ -325,7 +325,7 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_tvos:
325325
flavor: m1.mac
326326
commands:
327327
- command: unity-downloader-cli -u 6000.2/staging -c Editor -c AppleTV --fast --wait
328-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
328+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
329329
after:
330330
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
331331
artifacts:
@@ -399,6 +399,8 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_ios:
399399
players:
400400
paths:
401401
- build/players/**/*
402+
variables:
403+
UNITY_HANDLEUIINTERRUPTIONS: 1
402404

403405
# InputSystem-MobileFunctionalBuildJobs - 6000.3 - TvOS
404406
inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_tvos:
@@ -409,7 +411,7 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_tvos:
409411
flavor: m1.mac
410412
commands:
411413
- command: unity-downloader-cli -u trunk -c Editor -c AppleTV --fast --wait
412-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
414+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --artifacts-path=build/logs
413415
after:
414416
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
415417
artifacts:

‎.yamato/input-system-mobile-functional-tests.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ inputsystem-mobilefunctionaltests_-_2021_3_-_ios:
5757
image: package-ci/macos-13:default
5858
type: Unity::mobile::iPhone
5959
flavor: m1.mac
60+
model: SE
6061
commands:
6162
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
6263
after:
@@ -143,6 +144,7 @@ inputsystem-mobilefunctionaltests_-_2022_3_-_ios:
143144
image: package-ci/macos-13:default
144145
type: Unity::mobile::iPhone
145146
flavor: m1.mac
147+
model: SE
146148
commands:
147149
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
148150
after:
@@ -229,6 +231,7 @@ inputsystem-mobilefunctionaltests_-_6000_0_-_ios:
229231
image: package-ci/macos-13:default
230232
type: Unity::mobile::iPhone
231233
flavor: m1.mac
234+
model: SE
232235
commands:
233236
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
234237
after:
@@ -315,6 +318,7 @@ inputsystem-mobilefunctionaltests_-_6000_2_-_ios:
315318
image: package-ci/macos-13:default
316319
type: Unity::mobile::iPhone
317320
flavor: m1.mac
321+
model: SE
318322
commands:
319323
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
320324
after:
@@ -401,6 +405,7 @@ inputsystem-mobilefunctionaltests_-_6000_3_-_ios:
401405
image: package-ci/macos-13:default
402406
type: Unity::mobile::iPhone
403407
flavor: m1.mac
408+
model: SE-Gen3
404409
commands:
405410
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=!Performance --reruncount=1 --clean-library --player-load-path=build/players --artifacts-path=build/test-results
406411
after:

‎.yamato/input-system-mobile-performance-build-jobs.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ inputsystem-mobileperformancebuildjobs_-_2021_3_-_tvos:
7373
flavor: m1.mac
7474
commands:
7575
- command: unity-downloader-cli -u 2021.3/staging -c Editor -c AppleTV --fast --wait
76-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
76+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
7777
after:
7878
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
7979
artifacts:
@@ -157,7 +157,7 @@ inputsystem-mobileperformancebuildjobs_-_2022_3_-_tvos:
157157
flavor: m1.mac
158158
commands:
159159
- command: unity-downloader-cli -u 2022.3/staging -c Editor -c AppleTV --fast --wait
160-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
160+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
161161
after:
162162
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
163163
artifacts:
@@ -241,7 +241,7 @@ inputsystem-mobileperformancebuildjobs_-_6000_0_-_tvos:
241241
flavor: m1.mac
242242
commands:
243243
- command: unity-downloader-cli -u 6000.0/staging -c Editor -c AppleTV --fast --wait
244-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
244+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
245245
after:
246246
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
247247
artifacts:
@@ -325,7 +325,7 @@ inputsystem-mobileperformancebuildjobs_-_6000_2_-_tvos:
325325
flavor: m1.mac
326326
commands:
327327
- command: unity-downloader-cli -u 6000.2/staging -c Editor -c AppleTV --fast --wait
328-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
328+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
329329
after:
330330
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
331331
artifacts:
@@ -399,6 +399,8 @@ inputsystem-mobileperformancebuildjobs_-_6000_3_-_ios:
399399
players:
400400
paths:
401401
- build/players/**/*
402+
variables:
403+
UNITY_HANDLEUIINTERRUPTIONS: 1
402404

403405
# InputSystem-MobilePerformanceBuildJobs - 6000.3 - TvOS
404406
inputsystem-mobileperformancebuildjobs_-_6000_3_-_tvos:
@@ -409,7 +411,7 @@ inputsystem-mobileperformancebuildjobs_-_6000_3_-_tvos:
409411
flavor: m1.mac
410412
commands:
411413
- command: unity-downloader-cli -u trunk -c Editor -c AppleTV --fast --wait
412-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --platform=undefined --category=Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
414+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=Performance --platform=tvOS --clean-library --reruncount=1 --clean-library-on-rerun --build-only --report-performance-data --performance-project-id=InputSystem --player-save-path=build/players --artifacts-path=build/logs
413415
after:
414416
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
415417
artifacts:

‎.yamato/input-system-mobile-performance-tests.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ inputsystem-mobileperformancetests_-_2021_3_-_ios:
5757
image: package-ci/macos-13:default
5858
type: Unity::mobile::iPhone
5959
flavor: m1.mac
60+
model: SE
6061
commands:
6162
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --artifacts-path=build/test-results
6263
after:
@@ -143,6 +144,7 @@ inputsystem-mobileperformancetests_-_2022_3_-_ios:
143144
image: package-ci/macos-13:default
144145
type: Unity::mobile::iPhone
145146
flavor: m1.mac
147+
model: SE
146148
commands:
147149
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --artifacts-path=build/test-results
148150
after:
@@ -229,6 +231,7 @@ inputsystem-mobileperformancetests_-_6000_0_-_ios:
229231
image: package-ci/macos-13:default
230232
type: Unity::mobile::iPhone
231233
flavor: m1.mac
234+
model: SE
232235
commands:
233236
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --artifacts-path=build/test-results
234237
after:
@@ -315,6 +318,7 @@ inputsystem-mobileperformancetests_-_6000_2_-_ios:
315318
image: package-ci/macos-13:default
316319
type: Unity::mobile::iPhone
317320
flavor: m1.mac
321+
model: SE
318322
commands:
319323
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --artifacts-path=build/test-results
320324
after:
@@ -401,6 +405,7 @@ inputsystem-mobileperformancetests_-_6000_3_-_ios:
401405
image: package-ci/macos-13:default
402406
type: Unity::mobile::iPhone
403407
flavor: m1.mac
408+
model: SE-Gen3
404409
commands:
405410
- command: UnifiedTestRunner --suite=playmode --platform=ios --category=Performance --reruncount=1 --clean-library --report-performance-data --performance-project-id=InputSystem --player-load-path=build/players --artifacts-path=build/test-results
406411
after:

‎.yamato/mobile_config.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"run": {
99
"type": "Unity::mobile::iPhone",
1010
"image": "package-ci/macos-13:default",
11-
"flavor": "m1.mac"
11+
"flavor": "m1.mac",
12+
"model": "SE"
1213
}
1314
},
1415
"tvos": {

‎Tools/CI/Recipes/MobileFunctionalTests.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,19 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf
4141
.WithPlayerSavePath("build/players")
4242
.WithArtifacts("build/logs")));
4343
}
44+
else if(platform.System == SystemType.TvOS)
45+
{
46+
job.WithCommands(UtrCommand.Run(platform.System, b => b
47+
.WithTestProject($"{ProjectPath}")
48+
.WithEditor(".Editor")
49+
.WithSuite(UtrTestSuiteType.Playmode)
50+
.WithCategory("!Performance")
51+
.WithExtraArgs("--platform=tvOS --clean-library")
52+
.WithRerun(1, true)
53+
.WithBuildOnly()
54+
.WithPlayerSavePath("build/players")
55+
.WithArtifacts("build/logs")));
56+
}
4457
else
4558
{
4659
job.WithCommands(UtrCommand.Run(platform.System, b => b
@@ -58,6 +71,10 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf
5871

5972
job.WithArtifact(new Artifact("players", "build/players/**/*"), new Artifact("logs", "build/logs/**/*"))
6073
.WithInfrastructureInstabilityDetection<WrenchExtensions.CustomScriptInfo>();
74+
75+
if (platform.System == SystemType.IOS && float.Parse(unityVersion) > 6000.2f)
76+
job.WithEnvironmentVariable("UNITY_HANDLEUIINTERRUPTIONS", 1);
77+
6178
return job;
6279
}
6380
}
@@ -88,6 +105,10 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf
88105
}
89106
}
90107

108+
// For 6000.3+ versions, use iOS15 platform to run tests.
109+
if (platform.System == SystemType.IOS && float.Parse(unityVersion) > 6000.2f)
110+
platform = Settings.iOS15Platform;
111+
91112
IJobBuilder job = JobBuilder.Create(jobName).WithDescription(jobName).WithPlatform(platform);
92113

93114
if (platform.System == SystemType.Android)

‎Tools/CI/Recipes/MobilePerformanceTests.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,21 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf
4343
.WithPlayerSavePath("build/players")
4444
.WithArtifacts("build/logs")));
4545
}
46+
else if (platform.System == SystemType.TvOS)
47+
{
48+
job.WithCommands(UtrCommand.Run(platform.System, b => b
49+
.WithTestProject($"{ProjectPath}")
50+
.WithEditor(".Editor")
51+
.WithSuite(UtrTestSuiteType.Playmode)
52+
.WithCategory("Performance")
53+
.WithExtraArgs("--platform=tvOS --clean-library")
54+
.WithRerun(1, true)
55+
.WithBuildOnly()
56+
.WithPerformanceDataReporting(true)
57+
.WithPerformanceProject("InputSystem")
58+
.WithPlayerSavePath("build/players")
59+
.WithArtifacts("build/logs")));
60+
}
4661
else
4762
{
4863
job.WithCommands(UtrCommand.Run(platform.System, b => b
@@ -63,6 +78,10 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf
6378
job.WithArtifact(new Artifact("players", "build/players/**/*"),
6479
new Artifact("logs", "build/logs/**/*"))
6580
.WithInfrastructureInstabilityDetection<WrenchExtensions.CustomScriptInfo>();
81+
82+
if (platform.System == SystemType.IOS && float.Parse(unityVersion) > 6000.2f)
83+
job.WithEnvironmentVariable("UNITY_HANDLEUIINTERRUPTIONS", 1);
84+
6685
return job;
6786
}
6887
}
@@ -93,6 +112,10 @@ protected override IJobBuilder ProduceJob(string jobName, Package package, Platf
93112
}
94113
}
95114

115+
// For 6000.3+ versions, use iOS15 platform to run tests.
116+
if (platform.System == SystemType.IOS && float.Parse(unityVersion) > 6000.2f)
117+
platform = Settings.iOS15Platform;
118+
96119
IJobBuilder job = JobBuilder.Create(jobName).WithDescription(jobName).WithPlatform(platform);
97120

98121
if (platform.System == SystemType.Android)

‎Tools/CI/Settings/InputSystemSettings.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ public class InputSystemSettings : AnnotatedSettingsBase
3131

3232
// Mobile platforms which run tests jobs
3333
public readonly Dictionary<SystemType, Platform> MobileTestPlatforms = new();
34+
35+
// iOS platform with iOS 15 device (iPhone SE 3rd generation) for 6000.3+ editors
36+
public readonly Platform iOS15Platform;
3437

3538
public readonly string[] AndroidExtraCommands = new[]
3639
{
@@ -119,6 +122,9 @@ public InputSystemSettings()
119122
Wrench.PvpProfilesToCheck = new HashSet<string>() { "supported" };
120123

121124
ReadMobileConfig();
125+
126+
var oldIOSAgent = MobileTestPlatforms[SystemType.IOS].Agent;
127+
iOS15Platform = new Platform(new Agent(oldIOSAgent.Image, oldIOSAgent.Flavor, oldIOSAgent.Resource, "SE-Gen3"), SystemType.IOS);
122128
}
123129

124130
public WrenchSettings Wrench { get; private set; }
@@ -159,7 +165,8 @@ void ReadMobileConfig()
159165
MobileTestPlatforms.Add(platform, new Platform(
160166
new Agent(v["run"]["image"].ToString(),
161167
Utilities.GetEnumValue<FlavorType>(v["run"]["flavor"].ToString()),
162-
Utilities.GetEnumValue<ResourceType>(v["run"]["type"].ToString())),
168+
Utilities.GetEnumValue<ResourceType>(v["run"]["type"].ToString()),
169+
v["run"]["model"]?.ToString()),
163170
platform));
164171
}
165172
}

0 commit comments

Comments
 (0)