Browse Source

Revert "put goma client in depot_tools"

This reverts commit 6e48505301f4144dee51e90a40ba8a32f346a266.

Reason for revert: cause recursive calls of update_hook

  |   \_ bash /usr/local/google/home/ukai/depot_tools/gclient sync
ukai      29514  0.0  0.0  16104  3648 pts/10   S+   14:40   0:00  |
   |       \_ bash /usr/local/google/home/ukai/depot_tools/update_depot_tools sync
ukai      29586  0.0  0.0  15972  3276 pts/10   S+   14:40   0:00  |
   |           \_ bash /usr/local/google/home/ukai/depot_tools/goma_ctl update_hook
ukai      29614  0.0  0.0  15972  3192 pts/10   S+   14:40   0:00  |
   |               \_ bash /usr/local/google/home/ukai/depot_tools/goma_ctl update_hook

Original change's description:
> put goma client in depot_tools
> 
> install goma client cipd package in depot_tools.
> 
> Bug: b/77663154
> Change-Id: Ibcfc42b9b7705bcf71b4ba2e834b4ebf09ad25fe
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1846892
> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
> Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>

TBR=sque@chromium.org,ukai@chromium.org,yyanagisawa@google.com,tikuta@chromium.org,ehmaldonado@chromium.org,apolito@google.com

Change-Id: I644799c06f74a436b201c4c6c3de44af30c51556
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/77663154
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1866349
Reviewed-by: Fumitoshi Ukai <ukai@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@chromium.org>
Fumitoshi Ukai 5 years ago
parent
commit
8076771cb1
8 changed files with 0 additions and 63 deletions
  1. 0 1
      cipd_bin_setup.bat
  2. 0 2
      cipd_bin_setup.sh
  3. 0 8
      cipd_manifest.txt
  4. 0 12
      cipd_manifest.versions
  5. 0 12
      goma_auth
  6. 0 8
      goma_auth.bat
  7. 0 12
      goma_ctl
  8. 0 8
      goma_ctl.bat

+ 0 - 1
cipd_bin_setup.bat

@@ -4,4 +4,3 @@
 :: found in the LICENSE file.
 
 "%~dp0\cipd.bat" ensure -log-level warning -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin"
-"%~dp0\goma_ctl.bat" update_hook

+ 0 - 2
cipd_bin_setup.sh

@@ -19,6 +19,4 @@ function cipd_bin_setup {
         -log-level warning \
         -ensure-file "$ENSURE" \
         -root "$ROOT"
-
-    "$MYPATH/goma_ctl" update_hook
 }

+ 0 - 8
cipd_manifest.txt

@@ -10,11 +10,6 @@
 # For these, the git revision is the one of
 # https://chromium.googlesource.com/infra/infra.git.
 #
-# For goma client, generated via builders at
-# https://ci.chromium.org/p/infra-internal/g/goma-client/console
-# the git revision is the one of
-# https://chromium.googlesource.com/infra/goma/client.git
-#
 # To regenerate them (after modifying this file):
 #   cipd ensure-file-resolve -ensure-file cipd_manifest.txt
 $ResolvedVersions cipd_manifest.versions
@@ -52,6 +47,3 @@ infra/tools/bb/${platform} git_revision:bdbeaf7b6f457238c69f328bfc7684fc1f2a79e6
 
 # CHROMEOS Buildjobs CLI
 chromiumos/infra/crosjobs/${platform=linux-amd64} git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
-
-# goma client
-infra/goma/client/${os}-${arch=amd64} git_revision:6cff373df4908e2fbdc7dced3e5f03d0a4337da8

+ 0 - 12
cipd_manifest.versions

@@ -5,18 +5,6 @@ chromiumos/infra/crosjobs/linux-amd64
 	git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
 	_vAeU0Q9lAxn933K8vDhwGK40zKVvV-yXGpIy43ATXAC
 
-infra/goma/client/linux-amd64
-	git_revision:6cff373df4908e2fbdc7dced3e5f03d0a4337da8
-	foM8y4-U9H2vqYFss0qr012VYISzHCuqxrP6fYm6XjUC
-
-infra/goma/client/mac-amd64
-	git_revision:6cff373df4908e2fbdc7dced3e5f03d0a4337da8
-	DESRA5A06iQDrxRkNuftoCEi4ig8uAJzbbGa6YYtdz4C
-
-infra/goma/client/windows-amd64
-	git_revision:6cff373df4908e2fbdc7dced3e5f03d0a4337da8
-	SvCnuszdUOGoAw4JSzCP1WNPMIw3znGS6I0XucJwulsC
-
 infra/tools/bb/linux-386
 	git_revision:bdbeaf7b6f457238c69f328bfc7684fc1f2a79e6
 	Ebjauqd0o3KlNnOcHxG_IP-uZsOaRDndybE6ylUF4PIC

+ 0 - 12
goma_auth

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-MYPATH=$(dirname "${BASH_SOURCE[0]}")
-
-source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
-
-PYTHONDONTWRITEBYTECODE=1 exec python "$MYPATH/.cipd_bin/goma_auth.py" "$@"

+ 0 - 8
goma_auth.bat

@@ -1,8 +0,0 @@
-@echo off
-:: Copyright 2019 The Chromium Authors. All rights reserved.
-:: Use of this source code is governed by a BSD-style license that can be
-:: found in the LICENSE file.
-
-@call "%~dp0\cipd_bin_setup.bat" > null 2>&1
-@call python.bat %~dp0\.cipd_bin\goma_auth.py %*
-exit /b

+ 0 - 12
goma_ctl

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-MYPATH=$(dirname "${BASH_SOURCE[0]}")
-
-source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
-
-PYTHONDONTWRITEBYTECODE=1 exec python "$MYPATH/.cipd_bin/goma_ctl.py" "$@"

+ 0 - 8
goma_ctl.bat

@@ -1,8 +0,0 @@
-@echo off
-:: Copyright 2019 The Chromium Authors. All rights reserved.
-:: Use of this source code is governed by a BSD-style license that can be
-:: found in the LICENSE file.
-
-@call "%~dp0\cipd_bin_setup.bat" > null 2>&1
-@call python.bat %~dp0\.cipd_bin\goma_ctl.py %*
-exit /b