commit 776ddcf18b21921acf372d86a86a922d16bdd3d4
author Cindy Lin <xcl@google.com> Wed Jun 22 01:07:23 2022 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jun 27 23:57:04 2022 +0000
tree 930d61a96493dfd37661409251a88f3e504111aa
parent 1d1567a546f37b765ae32419f5a2c91ebc03fd16

build_packages.sh: Migrate building Chrome to py

Remote execution for building Chrome has migrated to Python so remove it
from this script.

BUG=b:218522022
TEST=cros tryjob -g 3717451 -g 3717106 {trogdor64-full-tryjob,amd64-generic-ubsan-fuzzer-tryjob,arm64-generic-full-tryjob,arm64-full-tryjob,grunt-full-tryjob,majolica-full-tryjob}, CQ

Cq-Depend: chromium:3717451
Change-Id: I9e6a773a9a43869c6f23f23996c9ba300bd78b20
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/3717106
Reviewed-by: Ram Chandrasekar <rchandrasekar@google.com>
Commit-Queue: Cindy Lin <xcl@google.com>
Tested-by: Cindy Lin <xcl@google.com>

build_packages.sh

diff --git a/build_packages.sh b/build_packages.sh
index 7c29dc5..a53595a 100644
--- a/build_packages.sh
+++ b/build_packages.sh
@@ -31,32 +31,6 @@
 DEFINE_string board_root "" \
   "Emerge packages to board_root."
 
-# --run_goma option is designed to be used on bots.
-# If you're trying to build pacakges with goma in your local dev env, this is
-# *not* the option you're looking for. Please see comments below.
-# This option; 1) starts goma, 2) builds packages (expecting that goma is
-# used), then 3) stops goma explicitly.
-# 3) 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.
-#
-# In local dev env cases, compiler_proxy is expected to keep running.
-# In such a case;
-#   $ python ${GOMA_DIR}/goma_ctl.py ensure_start
-#   $ ./build_packages (... and options without --run_goma ...)
-# is an expected commandline sequence. If you set --run_goma flag while
-# compiler_proxy is already running, the existing compiler_proxy will be
-# stopped.
-DEFINE_boolean run_goma "${FLAGS_FALSE}" \
-  "If set to true, (re)starts goma, builds packages, and then stops goma."
-
-# This option is for building chrome remotely.
-#1) starts reproxy 2) builds chrome with reproxy and 3) stops reproxy so
-# logs/stats can be collected.
-# Note: RECLIENT_DIR and REPROXY_CFG are expected to be passed via env var.
-DEFINE_boolean run_remoteexec "${FLAGS_FALSE}" \
-  "If set to true, starts RBE reproxy, builds packages, and then stops reproxy."
-
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
@@ -117,23 +91,6 @@
 
 info "Merging board packages now"
 (
-
-  # Start reproxy for remote execution of building chrome.
-  if [[ "${FLAGS_run_remoteexec}" -eq "${FLAGS_TRUE}" ]]; then
-    info "Starting RBE reproxy."
-    bootstrap="${RECLIENT_DIR}/bootstrap --cfg=${REPROXY_CFG} \
-      --re_proxy=${RECLIENT_DIR}/reproxy"
-    ${bootstrap}
-    trap "${bootstrap} --shutdown" EXIT
-  # Support goma on bots. This has to run in subshell, otherwise EXIT trap
-  # handler is overwritten.
-  elif [[ "${FLAGS_run_goma}" -eq "${FLAGS_TRUE}" ]]; then
-    info "Starting goma compiler_proxy."
-    goma_ctl="${GOMA_DIR:-${HOME}/goma}/goma_ctl.py"
-    "${goma_ctl}" restart
-    trap "'${goma_ctl}' stop" EXIT
-  fi
-
   info_run sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" "${PACKAGES[@]}" \
     --useoldpkg-atoms="${CRITICAL_SDK_PACKAGES[*]}" \
     --rebuild-exclude="${CRITICAL_SDK_PACKAGES[*]}"