[reclient] Migrate some android builders to reclient.

Migrate the following from goma client to reclient. Android arm Builder (dbg) Andriod arm64 Builder (dbg) Android ASAN (dbg) Android x64 Builder (dbg) Android x86 Builder (dbg) Also removes shadow builder Android arm64 Builder (dbg) (reclient) Bug: 1268581 Change-Id: I5bd7cabaa5650c13ecf0d6d82c2fc6eb709c3925 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3275643 Reviewed-by: Erik Staab <estaab@chromium.org> Commit-Queue: Michael Savigny <msavigny@google.com> Cr-Commit-Position: refs/heads/main@{#940831}
FairyWorld · Nov 11, 2021 · f3215c1 · f3215c1
1 parent e39ba78
commit f3215c1
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 205 deletions.
diff --git a/infra/config/generated/builders/ci/Android ASAN (dbg)/properties.textpb b/infra/config/generated/builders/ci/Android ASAN (dbg)/properties.textpb
@@ -1,10 +1,8 @@
 {
-  "$build/goma": {
-    "enable_ats": true,
-    "jobs": 150,
-    "rpc_extra_params": "?prod",
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": true
+  "$build/reclient": {
+    "instance": "rbe-chromium-trusted",
+    "jobs": 500,
+    "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],

diff --git a/infra/config/generated/builders/ci/Android arm Builder (dbg)/properties.textpb b/infra/config/generated/builders/ci/Android arm Builder (dbg)/properties.textpb
@@ -1,10 +1,8 @@
 {
-  "$build/goma": {
-    "enable_ats": true,
-    "jobs": 150,
-    "rpc_extra_params": "?prod",
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": true
+  "$build/reclient": {
+    "instance": "rbe-chromium-trusted",
+    "jobs": 250,
+    "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],

diff --git a/infra/config/generated/builders/ci/Android arm64 Builder (dbg) (reclient)/properties.textpb b/infra/config/generated/builders/ci/Android arm64 Builder (dbg) (reclient)/properties.textpb
diff --git a/infra/config/generated/builders/ci/Android arm64 Builder (dbg)/properties.textpb b/infra/config/generated/builders/ci/Android arm64 Builder (dbg)/properties.textpb
@@ -1,10 +1,8 @@
 {
-  "$build/goma": {
-    "enable_ats": true,
+  "$build/reclient": {
+    "instance": "rbe-chromium-trusted",
     "jobs": 500,
-    "rpc_extra_params": "?prod",
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": true
+    "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],

diff --git a/infra/config/generated/builders/ci/Android x64 Builder (dbg)/properties.textpb b/infra/config/generated/builders/ci/Android x64 Builder (dbg)/properties.textpb
@@ -1,10 +1,8 @@
 {
-  "$build/goma": {
-    "enable_ats": true,
-    "jobs": 150,
-    "rpc_extra_params": "?prod",
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": true
+  "$build/reclient": {
+    "instance": "rbe-chromium-trusted",
+    "jobs": 500,
+    "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],

diff --git a/infra/config/generated/builders/ci/Android x86 Builder (dbg)/properties.textpb b/infra/config/generated/builders/ci/Android x86 Builder (dbg)/properties.textpb
@@ -1,10 +1,8 @@
 {
-  "$build/goma": {
-    "enable_ats": true,
-    "jobs": 150,
-    "rpc_extra_params": "?prod",
-    "server_host": "goma.chromium.org",
-    "use_luci_auth": true
+  "$build/reclient": {
+    "instance": "rbe-chromium-trusted",
+    "jobs": 500,
+    "metrics_project": "chromium-reclient-metrics"
   },
   "$recipe_engine/resultdb/test_presentation": {
     "column_keys": [],

diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -2272,88 +2272,6 @@ buckets {
         }
       }
     }
-    builders {
-      name: "Android arm64 Builder (dbg) (reclient)"
-      swarming_host: "chromium-swarm.appspot.com"
-      dimensions: "builderless:1"
-      dimensions: "cores:8"
-      dimensions: "cpu:x86-64"
-      dimensions: "os:Ubuntu-18.04"
-      dimensions: "pool:luci.chromium.ci"
-      dimensions: "ssd:0"
-      exe {
-        cipd_package: "infra/chromium/bootstrapper/${platform}"
-        cipd_version: "latest"
-        cmd: "bootstrapper"
-      }
-      properties:
-        '{'
-        '  "$bootstrap/exe": {'
-        '    "exe": {'
-        '      "cipd_package": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build",'
-        '      "cipd_version": "refs/heads/main",'
-        '      "cmd": ['
-        '        "luciexe"'
-        '      ]'
-        '    }'
-        '  },'
-        '  "$bootstrap/properties": {'
-        '    "properties_file": "infra/config/generated/builders/ci/Android arm64 Builder (dbg) (reclient)/properties.textpb",'
-        '    "top_level_project": {'
-        '      "ref": "refs/heads/main",'
-        '      "repo": {'
-        '        "host": "chromium.googlesource.com",'
-        '        "project": "chromium/src"'
-        '      }'
-        '    }'
-        '  },'
-        '  "builder_group": "chromium.android.fyi",'
-        '  "led_builder_is_bootstrapped": true'
-        '}'
-      execution_timeout_secs: 18000
-      build_numbers: YES
-      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-      experiments {
-        key: "chromium.chromium_tests.use_rdb_results"
-        value: 100
-      }
-      experiments {
-        key: "luci.use_realms"
-        value: 100
-      }
-      resultdb {
-        enable: true
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "ci_test_results"
-          test_results {}
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "gpu_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test[^/]*/.+"
-            }
-          }
-        }
-        bq_exports {
-          project: "chrome-luci-data"
-          dataset: "chromium"
-          table: "blink_web_tests_ci_test_results"
-          test_results {
-            predicate {
-              test_id_regexp: "ninja://[^/]*blink_web_tests/.+"
-            }
-          }
-        }
-        history_options {
-          use_invocation_timestamp: true
-        }
-      }
-    }
     builders {
       name: "Android x64 Builder (dbg)"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg
@@ -1359,11 +1359,6 @@ consoles {
     category: "chromium.fyi|debug|builder"
     short_name: "64"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android arm64 Builder (dbg) (reclient)"
-    category: "chromium.android.fyi|builder|arm"
-    short_name: "64"
-  }
   header {
     oncalls {
       name: "Chromium"
@@ -3620,11 +3615,6 @@ consoles {
     category: "webview"
     short_name: "p-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android arm64 Builder (dbg) (reclient)"
-    category: "builder|arm"
-    short_name: "64"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Android ASAN (dbg) (reclient)"
     category: "builder|arm"

diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg
@@ -321,17 +321,6 @@ job {
     builder: "Android arm64 Builder (dbg)"
   }
 }
-job {
-  id: "Android arm64 Builder (dbg) (reclient)"
-  realm: "ci"
-  schedule: "triggered"
-  acl_sets: "ci"
-  buildbucket {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android arm64 Builder (dbg) (reclient)"
-  }
-}
 job {
   id: "Android x64 Builder (dbg)"
   realm: "ci"
@@ -7076,7 +7065,6 @@ trigger {
   triggers: "Android WebView P FYI (rel)"
   triggers: "Android arm Builder (dbg)"
   triggers: "Android arm64 Builder (dbg)"
-  triggers: "Android arm64 Builder (dbg) (reclient)"
   triggers: "Android x64 Builder (dbg)"
   triggers: "Android x86 Builder (dbg)"
   triggers: "CFI Linux CF"

diff --git a/infra/config/lib/ci.star b/infra/config/lib/ci.star
@@ -189,6 +189,7 @@ def ci_builder(
 def android_builder(
         *,
         name,
+        goma_backend = builders.goma.backend.RBE_PROD,
         # TODO(tandrii): migrate to this gradually (current value of
         # goma.jobs.MANY_JOBS_FOR_CI is 500).
         # goma_jobs=goma.jobs.MANY_JOBS_FOR_CI
@@ -198,7 +199,7 @@ def android_builder(
     return ci_builder(
         name = name,
         builder_group = "chromium.android",
-        goma_backend = builders.goma.backend.RBE_PROD,
+        goma_backend = goma_backend,
         goma_jobs = goma_jobs,
         sheriff_rotations = builders.sheriff_rotations.ANDROID,
         **kwargs

diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
@@ -494,6 +494,9 @@ ci.android_builder(
     # build.
     execution_timeout = 4 * time.hour,
     tree_closing = True,
+    goma_backend = None,
+    reclient_instance = rbe_instance.DEFAULT,
+    reclient_jobs = rbe_jobs.HIGH_JOBS_FOR_CI,
 )
 
 ci.android_builder(
@@ -552,6 +555,9 @@ ci.android_builder(
         short_name = "32",
     ),
     cq_mirrors_console_view = "mirrors",
+    goma_backend = None,
+    reclient_instance = rbe_instance.DEFAULT,
+    reclient_jobs = rbe_jobs.DEFAULT,
     execution_timeout = 4 * time.hour,
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
@@ -566,7 +572,9 @@ ci.android_builder(
         short_name = "64",
     ),
     cq_mirrors_console_view = "mirrors",
-    goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
+    goma_backend = None,
+    reclient_instance = rbe_instance.DEFAULT,
+    reclient_jobs = rbe_jobs.HIGH_JOBS_FOR_CI,
     execution_timeout = 7 * time.hour,
     main_console_view = main_console_if_on_branch(),
     tree_closing = True,
@@ -582,6 +590,9 @@ ci.android_builder(
     cq_mirrors_console_view = "mirrors",
     execution_timeout = 7 * time.hour,
     main_console_view = main_console_if_on_branch(),
+    goma_backend = None,
+    reclient_instance = rbe_instance.DEFAULT,
+    reclient_jobs = rbe_jobs.HIGH_JOBS_FOR_CI,
 )
 
 ci.android_builder(
@@ -594,6 +605,9 @@ ci.android_builder(
     cq_mirrors_console_view = "mirrors",
     execution_timeout = 6 * time.hour,
     main_console_view = main_console_if_on_branch(),
+    goma_backend = None,
+    reclient_instance = rbe_instance.DEFAULT,
+    reclient_jobs = rbe_jobs.HIGH_JOBS_FOR_CI,
 )
 
 ci.android_builder(
@@ -1028,21 +1042,6 @@ ci.android_builder(
     ),
 )
 
-ci.android_fyi_builder(
-    name = "Android arm64 Builder (dbg) (reclient)",
-    console_view_entry = consoles.console_view_entry(
-        category = "builder|arm",
-        short_name = "64",
-    ),
-    cq_mirrors_console_view = "mirrors",
-    reclient_jobs = 150,
-    execution_timeout = 5 * time.hour,
-    main_console_view = main_console_if_on_branch(),
-    reclient_instance = rbe_instance.DEFAULT,
-    os = os.LINUX_BIONIC_SWITCH_TO_DEFAULT,
-    schedule = "triggered",  # triggered manually via Scheduler UI
-)
-
 ci.android_fyi_builder(
     name = "Android ASAN (dbg) (reclient)",
     console_view_entry = consoles.console_view_entry(

diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
@@ -64,11 +64,6 @@
       }
     ]
   },
-  "Android arm64 Builder (dbg) (reclient)": {
-    "additional_compile_targets": [
-      "all"
-    ]
-  },
   "android-10-x86-fyi-rel-tests": {
     "gtest_tests": [
       {

diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
@@ -1091,11 +1091,6 @@
         'use_swarming': True,
         'os_type': 'android',
       },
-      'Android arm64 Builder (dbg) (reclient)': {
-        'additional_compile_targets': [
-          'all',
-        ],
-      },
       'android-10-x86-fyi-rel-tests': {
         'mixins': [
           'has_native_resultdb_integration',