Commit a8248735 authored by Simon Que's avatar Simon Que Committed by Commit Bot

Revert "Reland "infra: Migrate builders to Goma RBE (iOS Week 1a)""

This reverts commit eca48c52.

Reason for revert: Build still fails:
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8886863551848667888/+/steps/compile/0/stdout

Original change's description:
> Reland "infra: Migrate builders to Goma RBE (iOS Week 1a)"
> 
> This is a reland of 765c53e1
> 
> Original change's description:
> > infra: Migrate builders to Goma RBE (iOS Week 1a)
> > 
> > These are the two builders in webrtc.fyi:
> > - WebRTC Chromium FYI ios-device
> > - WebRTC Chromium FYI ios-simulator
> > 
> > These builders are small. They are expected to have a peak traffic of
> > 15 QPS:
> > https://docs.google.com/spreadsheets/d/1-XKh-CqSoUcXEqCETVywjmIo1C18P0qEBDCY50ozBb0/edit#gid=1721756715
> > 
> > Schedule of migration:
> > https://docs.google.com/spreadsheets/d/1TZhpasm6iceYm7zqkyEtZ1wn9ZcpREfH4LV4cusICJA/edit#gid=0
> > 
> > R=agable@chromium.org, bpastene@chromium.org, jbudorick@chromium.org, tikuta@chromium.org
> > 
> > Bug: 950413
> > Change-Id: Id47cc7887bbefaf4dfe9f72275b80c8f04c428a7
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2043185
> > Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com>
> > Reviewed-by: Ben Pastene <bpastene@chromium.org>
> > Reviewed-by: smut <smut@google.com>
> > Commit-Queue: Simon Que <sque@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#739771}
> 
> Bug: 950413
> Change-Id: Idf2146ed92e80075675c15b79f9d65633458258f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2074178
> Reviewed-by: smut <smut@google.com>
> Reviewed-by: Aaron Gable <agable@chromium.org>
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Commit-Queue: Simon Que <sque@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#746203}

TBR=sque@chromium.org,agable@chromium.org,yyanagisawa@google.com,smut@google.com,tikuta@chromium.org,bpastene@chromium.org,jbudorick@chromium.org

Change-Id: I75499291c14e80bb6a90be0ef2126a7b6f98b9a3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 950413
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2084217Reviewed-by: default avatarSimon Que <sque@chromium.org>
Commit-Queue: Simon Que <sque@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746298}
parent d459b683
...@@ -151,7 +151,6 @@ builder( ...@@ -151,7 +151,6 @@ builder(
name = 'WebRTC Chromium FYI ios-device', name = 'WebRTC Chromium FYI ios-device',
caches = [xcode_cache.x11c29], caches = [xcode_cache.x11c29],
executable = 'recipe:webrtc/chromium_ios', executable = 'recipe:webrtc/chromium_ios',
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY, os = os.MAC_ANY,
) )
...@@ -159,6 +158,5 @@ builder( ...@@ -159,6 +158,5 @@ builder(
name = 'WebRTC Chromium FYI ios-simulator', name = 'WebRTC Chromium FYI ios-simulator',
caches = [xcode_cache.x11c29], caches = [xcode_cache.x11c29],
executable = 'recipe:webrtc/chromium_ios', executable = 'recipe:webrtc/chromium_ios',
goma_backend = goma.backend.RBE_PROD,
os = os.MAC_ANY, os = os.MAC_ANY,
) )
...@@ -1154,15 +1154,5 @@ luci.console_view( ...@@ -1154,15 +1154,5 @@ luci.console_view(
category = 'cros|week3|kevin', category = 'cros|week3|kevin',
short_name = 'hwtests', short_name = 'hwtests',
), ),
luci.console_view_entry(
builder = 'webrtc.fyi/WebRTC Chromium FYI ios-device',
category = 'ios|week1a',
short_name = 'dev',
),
luci.console_view_entry(
builder = 'webrtc.fyi/WebRTC Chromium FYI ios-simulator',
category = 'ios|week1a',
short_name = 'sim',
),
], ],
) )
...@@ -20609,7 +20609,6 @@ buckets: < ...@@ -20609,7 +20609,6 @@ buckets: <
name: "webrtc/chromium_ios" name: "webrtc/chromium_ios"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "mastername:\"chromium.webrtc.fyi\"" properties_j: "mastername:\"chromium.webrtc.fyi\""
> >
execution_timeout_secs: 7200 execution_timeout_secs: 7200
...@@ -20631,7 +20630,6 @@ buckets: < ...@@ -20631,7 +20630,6 @@ buckets: <
name: "webrtc/chromium_ios" name: "webrtc/chromium_ios"
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
properties_j: "$build/goma:{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\"}"
properties_j: "mastername:\"chromium.webrtc.fyi\"" properties_j: "mastername:\"chromium.webrtc.fyi\""
> >
execution_timeout_secs: 7200 execution_timeout_secs: 7200
......
...@@ -5534,16 +5534,6 @@ consoles: < ...@@ -5534,16 +5534,6 @@ consoles: <
category: "cros|week3|kevin" category: "cros|week3|kevin"
short_name: "hwtests" short_name: "hwtests"
> >
builders: <
name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI ios-device"
category: "ios|week1a"
short_name: "dev"
>
builders: <
name: "buildbucket/luci.chromium.webrtc.fyi/WebRTC Chromium FYI ios-simulator"
category: "ios|week1a"
short_name: "sim"
>
header: < header: <
oncalls: < oncalls: <
name: "Chromium" name: "Chromium"
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
"gn_args": [ "gn_args": [
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
"ios_enable_code_signing=false", "ios_enable_code_signing=false",
"ios_use_goma_rbe=true",
"is_component_build=false", "is_component_build=false",
"is_debug=false", "is_debug=false",
"target_cpu=\"arm64\"", "target_cpu=\"arm64\"",
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
"gn_args": [ "gn_args": [
"goma_dir=\"$(goma_dir)\"", "goma_dir=\"$(goma_dir)\"",
"ios_enable_code_signing=false", "ios_enable_code_signing=false",
"ios_use_goma_rbe=true",
"is_component_build=false", "is_component_build=false",
"is_debug=true", "is_debug=true",
"symbol_level=1", "symbol_level=1",
......
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