Commit 59d664ef authored by Jeff Yoon's avatar Jeff Yoon Committed by Commit Bot

Add new ios-simulator-cr-recipe bot

ios-simulator-cr-recipe bot will be used to stage changes in support
of migration from iOS to Chromium recipes.

Bug: 912681
Change-Id: I5869d0bce510dbaf8a802f9c90f6a1e3fdac81a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1848367
Commit-Queue: Jeff Yoon <jeffyoon@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705344}
parent 6476b132
...@@ -831,6 +831,17 @@ builder_mixins { ...@@ -831,6 +831,17 @@ builder_mixins {
} }
} }
builder_mixins {
name: "ios-ci-cr"
mixins: "ios"
mixins: "mac"
# ios bots may run both on Mac Minis with cores:4 and VMs with cores:8.
dimensions: "cores:"
recipe {
properties: "xcode_build_version:11a420a"
}
}
builder_mixins { builder_mixins {
name: "ios-try" name: "ios-try"
mixins: "ios" mixins: "ios"
...@@ -840,6 +851,15 @@ builder_mixins { ...@@ -840,6 +851,15 @@ builder_mixins {
} }
} }
builder_mixins {
name: "ios-try-cr"
mixins: "ios"
mixins: "mac-try"
recipe {
properties: "xcode_build_version:11a420a"
}
}
builder_mixins { builder_mixins {
name: "ios-webrtc" name: "ios-webrtc"
dimensions: "os:Mac" dimensions: "os:Mac"
...@@ -2171,6 +2191,7 @@ buckets { ...@@ -2171,6 +2191,7 @@ buckets {
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-beta-simulator" } builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-beta-simulator" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-device" } builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-device" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-simulator" } builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-simulator" }
builders { mixins: "ios-ci-cr" mixins: "fyi-ci" name: "ios-simulator-cr-recipe" }
# Win bots. # Win bots.
builders { builders {
...@@ -4676,6 +4697,7 @@ buckets { ...@@ -4676,6 +4697,7 @@ buckets {
builders { mixins: "ios-try" name: "ios-simulator-eg" } builders { mixins: "ios-try" name: "ios-simulator-eg" }
builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" } builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" }
builders { mixins: "ios-try" name: "ios-slimnav" } builders { mixins: "ios-try" name: "ios-slimnav" }
builders { mixins: "ios-try-cr" name: "ios-simulator-cr-recipe" }
builders { builders {
mixins: "mac-dawn-try" mixins: "mac-dawn-try"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
......
...@@ -831,6 +831,17 @@ builder_mixins { ...@@ -831,6 +831,17 @@ builder_mixins {
} }
} }
builder_mixins {
name: "ios-ci-cr"
mixins: "ios"
mixins: "mac"
# ios bots may run both on Mac Minis with cores:4 and VMs with cores:8.
dimensions: "cores:"
recipe {
properties: "xcode_build_version:11a420a"
}
}
builder_mixins { builder_mixins {
name: "ios-try" name: "ios-try"
mixins: "ios" mixins: "ios"
...@@ -840,6 +851,15 @@ builder_mixins { ...@@ -840,6 +851,15 @@ builder_mixins {
} }
} }
builder_mixins {
name: "ios-try-cr"
mixins: "ios"
mixins: "mac-try"
recipe {
properties: "xcode_build_version:11a420a"
}
}
builder_mixins { builder_mixins {
name: "ios-webrtc" name: "ios-webrtc"
dimensions: "os:Mac" dimensions: "os:Mac"
...@@ -2171,6 +2191,7 @@ buckets { ...@@ -2171,6 +2191,7 @@ buckets {
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-beta-simulator" } builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-beta-simulator" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-device" } builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-device" }
builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-simulator" } builders { mixins: "ios-ci" mixins: "fyi-ci" name: "ios13-sdk-simulator" }
builders { mixins: "ios-ci-cr" mixins: "fyi-ci" name: "ios-simulator-cr-recipe" }
# Win bots. # Win bots.
builders { builders {
...@@ -4676,6 +4697,7 @@ buckets { ...@@ -4676,6 +4697,7 @@ buckets {
builders { mixins: "ios-try" name: "ios-simulator-eg" } builders { mixins: "ios-try" name: "ios-simulator-eg" }
builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" } builders { mixins: "ios-try" name: "ios-simulator-xcode-clang" }
builders { mixins: "ios-try" name: "ios-slimnav" } builders { mixins: "ios-try" name: "ios-slimnav" }
builders { mixins: "ios-try-cr" name: "ios-simulator-cr-recipe" }
builders { builders {
mixins: "mac-dawn-try" mixins: "mac-dawn-try"
mixins: "goma-rbe-prod" mixins: "goma-rbe-prod"
......
...@@ -2318,11 +2318,21 @@ consoles { ...@@ -2318,11 +2318,21 @@ consoles {
name: "buildbucket/luci.chromium.ci/ios-device-goma-canary-clobber" name: "buildbucket/luci.chromium.ci/ios-device-goma-canary-clobber"
category: "goma|ios" category: "goma|ios"
} }
builders {
name: "buildbucket/luci.chromium.ci/ios-simulator-cr-recipe"
category: "iOS"
short_name: "chr"
}
builders { builders {
name: "buildbucket/luci.chromium.ci/ios-webkit-tot" name: "buildbucket/luci.chromium.ci/ios-webkit-tot"
category: "iOS" category: "iOS"
short_name: "wk" short_name: "wk"
} }
builders {
name: "buildbucket/luci.chromium.ci/ios12-beta-simulator"
category: "iOS|iOS12"
short_name: "beta"
}
builders { builders {
name: "buildbucket/luci.chromium.ci/ios13-sdk-device" name: "buildbucket/luci.chromium.ci/ios13-sdk-device"
category: "iOS|iOS13" category: "iOS|iOS13"
...@@ -4546,6 +4556,9 @@ consoles { ...@@ -4546,6 +4556,9 @@ consoles {
builders { builders {
name: "buildbucket/luci.chromium.try/ios-device-xcode-clang" name: "buildbucket/luci.chromium.try/ios-device-xcode-clang"
} }
builders {
name: "buildbucket/luci.chromium.try/ios-simulator-cr-recipe"
}
builders { builders {
name: "buildbucket/luci.chromium.try/ios-simulator-cronet" name: "buildbucket/luci.chromium.try/ios-simulator-cronet"
} }
......
...@@ -357,6 +357,7 @@ trigger { ...@@ -357,6 +357,7 @@ trigger {
triggers: "ios-device-goma-rbe-latest-clobber" triggers: "ios-device-goma-rbe-latest-clobber"
triggers: "ios-device-xcode-clang" triggers: "ios-device-xcode-clang"
triggers: "ios-simulator" triggers: "ios-simulator"
triggers: "ios-simulator-cr-recipe"
triggers: "ios-simulator-cronet" triggers: "ios-simulator-cronet"
triggers: "ios-simulator-full-configs" triggers: "ios-simulator-full-configs"
triggers: "ios-simulator-noncq" triggers: "ios-simulator-noncq"
...@@ -1350,6 +1351,16 @@ job { ...@@ -1350,6 +1351,16 @@ job {
} }
} }
job {
id: "ios-simulator-cr-recipe"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "ios-simulator-cr-recipe"
}
}
job { job {
id: "ios-simulator-xcode-clang" id: "ios-simulator-xcode-clang"
acl_sets: "default" acl_sets: "default"
......
...@@ -2318,11 +2318,21 @@ consoles { ...@@ -2318,11 +2318,21 @@ consoles {
name: "buildbucket/luci.chromium.ci/ios-device-goma-canary-clobber" name: "buildbucket/luci.chromium.ci/ios-device-goma-canary-clobber"
category: "goma|ios" category: "goma|ios"
} }
builders {
name: "buildbucket/luci.chromium.ci/ios-simulator-cr-recipe"
category: "iOS"
short_name: "chr"
}
builders { builders {
name: "buildbucket/luci.chromium.ci/ios-webkit-tot" name: "buildbucket/luci.chromium.ci/ios-webkit-tot"
category: "iOS" category: "iOS"
short_name: "wk" short_name: "wk"
} }
builders {
name: "buildbucket/luci.chromium.ci/ios12-beta-simulator"
category: "iOS|iOS12"
short_name: "beta"
}
builders { builders {
name: "buildbucket/luci.chromium.ci/ios13-sdk-device" name: "buildbucket/luci.chromium.ci/ios13-sdk-device"
category: "iOS|iOS13" category: "iOS|iOS13"
...@@ -4546,6 +4556,9 @@ consoles { ...@@ -4546,6 +4556,9 @@ consoles {
builders { builders {
name: "buildbucket/luci.chromium.try/ios-device-xcode-clang" name: "buildbucket/luci.chromium.try/ios-device-xcode-clang"
} }
builders {
name: "buildbucket/luci.chromium.try/ios-simulator-cr-recipe"
}
builders { builders {
name: "buildbucket/luci.chromium.try/ios-simulator-cronet" name: "buildbucket/luci.chromium.try/ios-simulator-cronet"
} }
......
...@@ -357,6 +357,7 @@ trigger { ...@@ -357,6 +357,7 @@ trigger {
triggers: "ios-device-goma-rbe-latest-clobber" triggers: "ios-device-goma-rbe-latest-clobber"
triggers: "ios-device-xcode-clang" triggers: "ios-device-xcode-clang"
triggers: "ios-simulator" triggers: "ios-simulator"
triggers: "ios-simulator-cr-recipe"
triggers: "ios-simulator-cronet" triggers: "ios-simulator-cronet"
triggers: "ios-simulator-full-configs" triggers: "ios-simulator-full-configs"
triggers: "ios-simulator-noncq" triggers: "ios-simulator-noncq"
...@@ -1350,6 +1351,16 @@ job { ...@@ -1350,6 +1351,16 @@ job {
} }
} }
job {
id: "ios-simulator-cr-recipe"
acl_sets: "default"
buildbucket: {
server: "cr-buildbucket.appspot.com"
bucket: "luci.chromium.ci"
builder: "ios-simulator-cr-recipe"
}
}
job { job {
id: "ios-simulator-xcode-clang" id: "ios-simulator-xcode-clang"
acl_sets: "default" acl_sets: "default"
......
...@@ -10548,6 +10548,7 @@ ...@@ -10548,6 +10548,7 @@
} }
] ]
}, },
"ios-simulator-cr-recipe": {},
"linux-annotator-rel": { "linux-annotator-rel": {
"scripts": [ "scripts": [
{ {
......
...@@ -1776,6 +1776,9 @@ ...@@ -1776,6 +1776,9 @@
'gtest_tests': 'ios_code_coverage_gtests', 'gtest_tests': 'ios_code_coverage_gtests',
} }
}, },
'ios-simulator-cr-recipe': {
'test_suites': {}
},
'linux-annotator-rel': { 'linux-annotator-rel': {
'test_suites': { 'test_suites': {
'scripts': 'test_traffic_annotation_auditor_script', 'scripts': 'test_traffic_annotation_auditor_script',
......
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