commit 00becd4bf0198d4dbbd488f5dcff535adcab70fa
author Fumitoshi Ukai <ukai@google.com> Fri Jan 13 12:51:26 2023 +0900
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jan 17 07:18:42 2023 +0000
tree b19a9b833451930c857dab74ceabd6b61993d9cd
parent 6e42669c7f6c3a0d5e083075f0a463e765721554

cleanup goma_client_json support

goma_client_json is no longer supported.

BUG=chromium:1359171
TEST=./run_tests

Change-Id: Ic3ba2f341fa7e026b22b2cfc410fa2287658e516
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4160820
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Madeleine Hardt <hardtmad@google.com>
Tested-by: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>

scripts/build_packages.py

diff --git a/scripts/build_packages.py b/scripts/build_packages.py
index d8af3bd..20b156f 100644
--- a/scripts/build_packages.py
+++ b/scripts/build_packages.py
@@ -375,8 +375,7 @@
     # This option; 1) starts goma, 2) builds packages (expecting that goma is
     # used), then 3) stops goma explicitly.
     # 4) is a request from the goma team, so that stats/logs can be taken.
-    # Note: GOMA_DIR and GOMA_SERVICE_ACCOUNT_JSON_FILE are expected to be passed
-    # via env var.
+    # Note: GOMA_DIR is expected to be passed via env var.
     #
     # In local dev env cases, compiler_proxy is expected to keep running.
     # In such a case;

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 170d0a5..8138193 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -313,14 +313,6 @@
         api=constants.REEXEC_API_CHROMEOS_GOMA_DIR,
         help="Specify a directory containing goma for " "build package.",
     )
-    # TODO(crbug.com/1359171): cleanup the flag.
-    parser.add_option(
-        "--goma_client_json",
-        type="path",
-        api=constants.REEXEC_API_GOMA,
-        help="Specify a service-account-goma-client.json path.",
-    )
-
     group = CustomGroup(parser, "Deprecated Options")
 
     parser.add_option(

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index c03c4af..25f6550 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -200,7 +200,6 @@
     chrome_root,
     chrome_root_mount,
     goma_dir,
-    goma_client_json,
     reclient_dir,
     reproxy_cfg_file,
     working_dir,
@@ -218,8 +217,6 @@
         cmd.extend(["--chrome_root_mount", chrome_root_mount])
     if goma_dir:
         cmd.extend(["--goma_dir", goma_dir])
-    if goma_client_json:
-        cmd.extend(["--goma_client_json", goma_client_json])
     if reclient_dir:
         cmd.extend(["--reclient_dir", reclient_dir])
     if reproxy_cfg_file:
@@ -878,12 +875,6 @@
         help="Goma installed directory to mount into the chroot.",
     )
     parser.add_argument(
-        "--goma_client_json",
-        type="path",
-        help="Service account json file to use goma on bot. "
-        "Mounted into the chroot.",
-    )
-    parser.add_argument(
         "--reclient-dir",
         type="path",
         help="Reclient installed directory to mount into the chroot.",
@@ -1500,7 +1491,6 @@
                 options.chrome_root,
                 options.chrome_root_mount,
                 options.goma_dir,
-                options.goma_client_json,
                 options.reclient_dir,
                 options.reproxy_cfg_file,
                 options.working_dir,