Skip to content

GitLab

T
tangled
Commit 5cf4bd84 authored by Sergey Berezin's avatar Sergey Berezin Committed by Commit Bot
Browse files
Options

[ios] Use "xcode build version" everywhere 

This deprecates "xcode version" tag and replaces it with the new "xcode build
version" tag, effectively migrating off of a system-installed Xcode to Xcode
installed per build as requested by the config.

Additionally, use the appropriate Xcode version that supplies legacy iOS
simulators, so we do not depend on system-installed simulators.

R=justincohen@chromium.org

Bug: 835036
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ia73c843ed907cef943b2ab9ec550366a338212e0
Reviewed-on: https://chromium-review.googlesource.com/1028650
Commit-Queue: Sergey Berezin <sergeyberezin@chromium.org>
Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554929}
parent 9947cd2d
Show whitespace changes
Inline Side-by-side
Showing with 132 additions and 31 deletions
ios/build/bots/chromium.fyi/ios-simulator-cronet.json
View file @ 5cf4bd84
......@@ -22,39 +22,78 @@
"target_os=\"ios\"",
"use_platform_icu_alternatives=true"
],
"configuration": "Debug",
"sdk": "iphonesimulator11.0",
"tests": [
{
"app": "cronet_unittests_ios",
"device type": "iPhone 5s",
"os": "9.3"
"comments": [
"This still relies on system iOS 9.3 legacy simulators,",
"since Xcode 8.0 doesn't provide it. But our test runner",
"doesn't support Xcode 7.3 anymore..."
],
"os": "9.3",
"xcode build version": "8A218a",
"comments": [
"Xcode 8.0 requires Mac-10.11.5+ and we still have 10.10 bots"
],
"dimensions": [
{ "os": "Mac-10.11.6", "pool": "Chrome" },
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "cronet_test",
"device type": "iPhone 5s",
"os": "9.3"
"os": "9.3",
"xcode build version": "8A218a",
"dimensions": [
{ "os": "Mac-10.11.6", "pool": "Chrome" },
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "cronet_test",
"device type": "iPad Retina",
"os": "9.3",
"xcode version": "8.0"
"xcode build version": "8A218a",
"dimensions": [
{ "os": "Mac-10.11.6", "pool": "Chrome" },
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "cronet_test",
"device type": "iPhone 5s",
"os": "11.2"
"os": "11.2",
"comments": [
"Xcode 9.2 requires Mac OS 10.12+, but we still have 10.11 on some",
"bots. Once all swarming bots are upgraded, dimensions can be removed."
],
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "cronet_test",
"device type": "iPad Air 2",
"os": "11.2"
"os": "11.2",
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "cronet_test",
"device type": "iPhone X",
"os": "11.2"
"os": "11.2",
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
}
]
......
ios/build/bots/chromium.fyi/ios-simulator.json
View file @ 5cf4bd84
......@@ -22,7 +22,15 @@
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone 6s",
"os": "11.2"
"os": "11.2",
"comments": [
"Xcode 9.2 requires Mac OS 10.12+, but we still have 10.11 on some",
"bots. Once all swarming bots are upgraded, dimensions can be removed."
],
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "ios_chrome_integration_egtests",
......@@ -31,7 +39,11 @@
],
"device type": "iPhone 6s",
"os": "11.2",
"xctest": true
"xctest": true,
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "ios_chrome_integration_egtests",
......@@ -40,7 +52,13 @@
],
"device type": "iPad Air 2",
"os": "10.0",
"xctest": true
"xctest": true,
"xcode build version": "8A218a",
"dimensions": [
{ "os": "Mac-10.11.6", "pool": "Chrome" },
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "ios_chrome_integration_egtests",
......@@ -49,7 +67,11 @@
],
"device type": "iPhone 6s",
"os": "11.2",
"xctest": true
"xctest": true,
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "ios_chrome_smoke_egtests",
......@@ -58,7 +80,11 @@
],
"device type": "iPhone 6s",
"os": "11.2",
"xctest": true
"xctest": true,
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "ios_chrome_web_egtests",
......@@ -67,7 +93,11 @@
],
"device type": "iPhone 6s",
"os": "11.2",
"xctest": true
"xctest": true,
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "ios_web_shell_egtests",
......@@ -76,7 +106,11 @@
],
"device type": "iPhone 6s",
"os": "11.2",
"xctest": true
"xctest": true,
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "ios_chrome_ui_egtests",
......@@ -85,7 +119,11 @@
],
"device type": "iPhone 6s",
"os": "11.2",
"xctest": true
"xctest": true,
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
}
]
}
ios/build/bots/chromium.mac/ios-simulator-cronet.json
View file @ 5cf4bd84
{
"comments": [
"Cronet tests 64-bit iOS 11.0 simulators."
"Cronet tests 64-bit iOS 9.3 and 11.2 simulators."
],
"xcode build version": "9C40b",
"comments": [
"TODO(crbug.com/803158): remove enable_precompiled_headers=false",
"when the bug is fixed."
],
"gn_args": [
"additional_target_cpus=[\"x86\"]",
"disable_brotli_filter=false",
"disable_file_support=true",
"disable_ftp_support=true",
"enable_precompiled_headers=false",
"enable_websockets=false",
"goma_dir=\"$(goma_dir)\"",
"ios_deployment_target=\"9.0\"",
......@@ -25,23 +20,49 @@
"target_os=\"ios\"",
"use_platform_icu_alternatives=true"
],
"configuration": "Debug",
"sdk": "iphonesimulator11.2",
"tests": [
{
"app": "cronet_unittests_ios",
"device type": "iPhone 5s",
"os": "9.3"
"comments": [
"This still relies on system iOS 9.3 legacy simulators,",
"since Xcode 8.0 doesn't provide it. But our test runner",
"doesn't support Xcode 7.3 anymore..."
],
"os": "9.3",
"xcode build version": "8A218a",
"comments": [
"Xcode 8.0 requires Mac-10.11.5+ and we still have 10.10 bots"
],
"dimensions": [
{ "os": "Mac-10.11.6", "pool": "Chrome" },
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "cronet_test",
"device type": "iPhone 5s",
"os": "9.3"
"os": "9.3",
"xcode build version": "8A218a",
"dimensions": [
{ "os": "Mac-10.11.6", "pool": "Chrome" },
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
},
{
"app": "cronet_test",
"device type": "iPad Air 2",
"os": "11.2"
"os": "11.2",
"comments": [
"Xcode 9.2 requires Mac OS 10.12+, but we still have 10.11 on some",
"bots. Once all swarming bots are upgraded, dimensions can be removed."
],
"dimensions": [
{ "os": "Mac-10.12", "pool": "Chrome" },
{ "os": "Mac-10.13", "pool": "Chrome" }
]
}
]
}
ios/build/bots/chromium.webrtc.fyi/ios-device.json
View file @ 5cf4bd84
......@@ -3,7 +3,7 @@
"Builder for 32-bit devices.",
"Build is performed with gn+ninja."
],
"xcode version": "8.0",
"xcode build version": "8A218a",
"gn_args": [
"additional_target_cpus=[ \"arm64\" ]",
"goma_dir=\"$(goma_dir)\"",
......@@ -17,8 +17,6 @@
"additional_compile_targets": [
"all"
],
"configuration": "Release",
"sdk": "iphoneos10.0",
"tests": [
]
}
ios/build/bots/chromium.webrtc.fyi/ios-simulator.json
View file @ 5cf4bd84
......@@ -2,7 +2,7 @@
"comments": [
"Runs tests on @3x, @2x, 64-bit, 32-bit, phone, tablet, iOS 10, and iOS 9."
],
"xcode version": "8.0",
"xcode build version": "8A218a",
"gn_args": [
"additional_target_cpus=[\"x86\"]",
"goma_dir=\"$(goma_dir)\"",
......@@ -48,6 +48,11 @@
{
"include": "common_tests.json",
"device type": "iPhone 5",
"comments": [
"This still relies on system iOS 9.0 legacy simulators,",
"since Xcode 8.0 doesn't provide it. But our test runner",
"doesn't support Xcode 7.0 anymore..."
],
"os": "9.0"
},
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment