Skip to content

GitLab

T
tangled
Commit 8be3348c authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot
Browse files
Options

Repurpose ios12-sdk-xcode-clang as ios-slimnav. 

Change-Id: If0b97a63239476ed2bb9c5ee9fdf87007f29c36c
Reviewed-on: https://chromium-review.googlesource.com/c/1322389Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarDanyao Wang <danyao@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606053}
parent 510ff066
Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 51 deletions
infra/config/global/cr-buildbucket.cfg
View file @ 8be3348c
......@@ -1496,10 +1496,10 @@ buckets {
builders { mixins: "ios-ci" name: "ios-uirefresh-simulator" }
builders { mixins: "ios-ci" name: "ios-webview" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios-simulator-cronet" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios-slimnav" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-beta-simulator" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-sdk-device" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-sdk-simulator" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios12-sdk-xcode-clang" }
# Win bots.
builders {
......
infra/config/global/luci-milo.cfg
View file @ 8be3348c
......@@ -2590,6 +2590,11 @@ consoles {
name: "buildbucket/luci.chromium.ci/ios-device-goma-canary-clobber"
category: "goma|ios"
}
builders {
name: "buildbucket/luci.chromium.ci/ios-slimnav"
category: "iOS"
short_name: "slim"
}
builders {
name: "buildbucket/luci.chromium.ci/ios-simulator"
category: "iOS"
......@@ -2609,11 +2614,6 @@ consoles {
category: "iOS|iOS12"
short_name: "sim"
}
builders {
name: "buildbucket/luci.chromium.ci/ios12-sdk-xcode-clang"
category: "iOS|iOS12"
short_name: "xcode"
}
builders {
name: "buildbucket/luci.chromium.ci/Jumbo Linux x64"
category: "jumbo"
......@@ -2979,6 +2979,11 @@ consoles {
name: "buildbucket/luci.chromium.ci/ios-device-goma-canary-clobber"
category: "goma|ios"
}
builders {
name: "buildbucket/luci.chromium.ci/ios-slimnav"
category: "iOS"
short_name: "slim"
}
builders {
name: "buildbot/chromium.fyi/ios-simulator"
name: "buildbucket/luci.chromium.ci/ios-simulator"
......@@ -2994,11 +2999,6 @@ consoles {
category: "iOS|iOS12"
short_name: "sim"
}
builders {
name: "buildbucket/luci.chromium.ci/ios12-sdk-xcode-clang"
category: "iOS|iOS12"
short_name: "xcode"
}
builders {
name: "buildbot/chromium.fyi/Jumbo Linux x64"
name: "buildbucket/luci.chromium.ci/Jumbo Linux x64"
......
infra/config/global/luci-scheduler.cfg
View file @ 8be3348c
......@@ -297,12 +297,12 @@ trigger {
triggers: "ios-simulator-cronet"
triggers: "ios-simulator-full-configs"
triggers: "ios-simulator-xcode-clang"
triggers: "ios-slimnav"
triggers: "ios-uirefresh-simulator"
triggers: "ios-webview"
triggers: "ios12-beta-simulator"
triggers: "ios12-sdk-device"
triggers: "ios12-sdk-simulator"
triggers: "ios12-sdk-xcode-clang"
triggers: "linux-annotator-rel"
triggers: "linux-blink-animation-use-time-delta"
triggers: "linux-blink-heap-incremental-marking"
......@@ -1137,6 +1137,16 @@ job {
}
}
job {
id: "ios-slimnav"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "ios-slimnav"
}
}
job {
id: "ios-webview"
acl_sets: "default"
......@@ -1187,16 +1197,6 @@ job {
}
}
job {
id: "ios12-sdk-xcode-clang"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "ios12-sdk-xcode-clang"
}
}
job {
id: "ios-uirefresh-simulator"
acl_sets: "default"
......
ios/build/bots/chromium.fyi/ios-slimnav.json 0 → 100644
View file @ 8be3348c
{
"comments": [
"Test the SlimNavigationManager feature."
],
"xcode build version": "10a254a",
"gn_args": [
"goma_dir=\"$(goma_dir)\"",
"is_component_build=false",
"is_debug=true",
"symbol_level=1",
"target_cpu=\"x64\"",
"target_os=\"ios\"",
"use_goma=true"
],
"configuration": "Debug",
"tests": [
{
"include": "screen_size_dependent_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone 6s Plus",
"os": "12.0",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "screen_size_dependent_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone 6s",
"os": "12.0",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "common_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone 6s",
"os": "12.0",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "screen_size_dependent_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "12.0",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "screen_size_dependent_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone 6s Plus",
"os": "11.4",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "screen_size_dependent_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone 6s",
"os": "11.4",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "common_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone 6s",
"os": "11.4",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "screen_size_dependent_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "11.4",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "eg_cq_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone 6s",
"os": "11.4",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "eg_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "11.4",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "eg_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPad Air 2",
"os": "12.0",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "eg_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "11.4",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "eg_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "12.0",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "eg_cq_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "11.4",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
},
{
"include": "eg_cq_tests.json",
"test args": [
"--enable-features=SlimNavigationManager"
],
"device type": "iPhone X",
"os": "12.0",
"dimensions": [
{ "os": "Mac-10.13.4", "pool": "Chrome" },
{ "os": "Mac-10.13.5", "pool": "Chrome" },
{ "os": "Mac-10.13.6", "pool": "Chrome" }
],
"priority": 29
}
]
}
ios/build/bots/chromium.fyi/ios12-sdk-xcode-clang.json deleted 100644 → 0
View file @ 510ff066
{
"comments": [
"Tests for iOS 12.0 beta xcode clang. Goma can be enabled for beta 4 and",
"the final GM, but disabled for the other betas to reduce swirl for the",
"goma team. Build is performed with gn+ninja."
],
"xcode build version": "10a254a",
"use xcode build version": true,
"gn_args": [
"ios_enable_code_signing=false",
"is_component_build=false",
"is_debug=true",
"symbol_level=0",
"target_cpu=\"x64\"",
"target_os=\"ios\"",
"use_goma=true",
"goma_dir=\"$(goma_dir)\"",
"use_xcode_clang=true"
],
"env": {
"FORCE_MAC_TOOLCHAIN": ""
},
"additional_compile_targets": [
"all"
],
"configuration": "Debug",
"tests": [
]
}
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