Эх сурвалжийг харах

remove goma CIPD package

goma is not used by developers now.

Bug: b/304421889
Change-Id: I68ffd73336f2303484dd44bce6c3984b06faa681
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5395370
Reviewed-by: Junji Watanabe <jwata@google.com>
Reviewed-by: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Takuto Ikuta 1 жил өмнө
parent
commit
495b23b39a

+ 0 - 6
OWNERS

@@ -40,12 +40,6 @@ per-file reclient*=file://RECLIENT_OWNERS
 per-file bazel*=file://CROS_OWNERS
 per-file bazel*=file://CROS_OWNERS
 per-file bazel*=file://BUILD_OWNERS
 per-file bazel*=file://BUILD_OWNERS
 
 
-# Goma
-per-file goma*=file://BUILD_OWNERS
-
-# For Goma client updates
-per-file cipd_manifest*=file://BUILD_OWNERS
-
 per-file presubmit*.py=brucedawson@chromium.org
 per-file presubmit*.py=brucedawson@chromium.org
 
 
 per-file pylint*=vapier@chromium.org
 per-file pylint*=vapier@chromium.org

+ 0 - 9
cipd_manifest.txt

@@ -16,11 +16,6 @@
 # For these, the git revision is the one of
 # For these, the git revision is the one of
 # https://chromium.googlesource.com/infra/infra.git.
 # 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):
 # To regenerate them (after modifying this file):
 #   cipd ensure-file-resolve -ensure-file cipd_manifest.txt
 #   cipd ensure-file-resolve -ensure-file cipd_manifest.txt
 $ResolvedVersions cipd_manifest.versions
 $ResolvedVersions cipd_manifest.versions
@@ -62,10 +57,6 @@ infra/tools/rdb/${platform} git_revision:00128613d2f26cd8d9df7fe2a16e024bb644528
 # CHROMEOS Buildjobs CLI
 # CHROMEOS Buildjobs CLI
 chromiumos/infra/crosjobs/${platform=linux-amd64} git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
 chromiumos/infra/crosjobs/${platform=linux-amd64} git_revision:ed616d595eb7241d39d34907050d2949121d6ae8
 
 
-# goma client
-infra/goma/client/${os=linux,windows}-${arch=amd64} git_revision:603dfba63fe365a01879029588b48b6f122fe0b8
-infra/goma/client/${os=mac}-${arch} git_revision:603dfba63fe365a01879029588b48b6f122fe0b8
-
 # dirmd, a tool to work with DIR_METADATA files
 # dirmd, a tool to work with DIR_METADATA files
 infra/tools/dirmd/${platform} git_revision:9558e2c2dc002209753b8e61b83c4a2c81361fbc
 infra/tools/dirmd/${platform} git_revision:9558e2c2dc002209753b8e61b83c4a2c81361fbc
 
 

+ 0 - 16
cipd_manifest.versions

@@ -65,22 +65,6 @@ infra/chromeperf/pinpoint/windows-arm64
 	git_revision:bd3a982ae62b4820b71414b2340e86019a1fbd26
 	git_revision:bd3a982ae62b4820b71414b2340e86019a1fbd26
 	pJxQ0Hl-ATP8eyFijAa3xaYIms_8nfXxSX07XVxyKIwC
 	pJxQ0Hl-ATP8eyFijAa3xaYIms_8nfXxSX07XVxyKIwC
 
 
-infra/goma/client/linux-amd64
-	git_revision:603dfba63fe365a01879029588b48b6f122fe0b8
-	QZEdb4w286MM6sd9ALcXw36jDYQY9S1Vma5cfyQF8Y4C
-
-infra/goma/client/mac-amd64
-	git_revision:603dfba63fe365a01879029588b48b6f122fe0b8
-	t2mJ5uhpan9AXxG0D-h5C5IOfz4ZUNjGV5UzsZnj6JUC
-
-infra/goma/client/mac-arm64
-	git_revision:603dfba63fe365a01879029588b48b6f122fe0b8
-	sf__pdfvHmVZLaWZ9Px92vfrxu0Kc7z6YmwiiLe-wsYC
-
-infra/goma/client/windows-amd64
-	git_revision:603dfba63fe365a01879029588b48b6f122fe0b8
-	TsKkiGBqIo_4FByeFHO6k_8We2PKr4agbEcShhxHd6MC
-
 infra/rbe/client/linux-amd64
 infra/rbe/client/linux-amd64
 	re_client_version:0.124.1.13f78cc-gomaip
 	re_client_version:0.124.1.13f78cc-gomaip
 	LCOZhNACP54nV-xYsKIGGOzlFnVyacNwmv4YzqxxgOYC
 	LCOZhNACP54nV-xYsKIGGOzlFnVyacNwmv4YzqxxgOYC

+ 0 - 5
cipd_manifest_cros_python2.txt

@@ -16,11 +16,6 @@
 # For these, the git revision is the one of
 # For these, the git revision is the one of
 # https://chromium.googlesource.com/infra/infra.git.
 # 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):
 # To regenerate them (after modifying this file):
 #   cipd ensure-file-resolve -ensure-file cipd_manifest_cros_python2.txt
 #   cipd ensure-file-resolve -ensure-file cipd_manifest_cros_python2.txt
 $ResolvedVersions cipd_manifest_cros_python2.versions
 $ResolvedVersions cipd_manifest_cros_python2.versions

+ 0 - 20
goma_auth

@@ -1,20 +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.
-
-# See revert instructions in cipd_manifest.txt
-
-# In git bash on Windows, invoke the batch file.
-if [ "$(expr "$(uname -s)" : "^MINGW64_NT")" == "10" ]; then
-    goma_auth.bat "$@"
-    exit
-fi
-
-MYPATH=$(dirname "${BASH_SOURCE[0]}")
-
-source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
-
-PYTHONDONTWRITEBYTECODE=1 exec python3 "$MYPATH/.cipd_bin/goma_auth.py" "$@"

+ 0 - 12
goma_auth.bat

@@ -1,12 +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.
-
-:: See revert instructions in cipd_manifest.txt
-
-set scriptdir=%~dp0
-
-@call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
-@call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_auth.py %*
-exit /b %ERRORLEVEL%

+ 0 - 25
goma_ctl

@@ -1,25 +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.
-
-# See revert instructions in cipd_manifest.txt
-
-# In git bash on Windows, invoke the batch file.
-if [ "$(expr "$(uname -s)" : "^MINGW64_NT")" == "10" ]; then
-    goma_ctl.bat "$@"
-    exit
-fi
-
-MYPATH=$(dirname "${BASH_SOURCE[0]}")
-
-source "$MYPATH/cipd_bin_setup.sh"
-cipd_bin_setup &> /dev/null
-
-GOMA="$MYPATH/.cipd_bin/goma_ctl.py"
-if [[ -f "$GOMA" ]]; then
-    PYTHONDONTWRITEBYTECODE=1 exec python3 "$GOMA" "$@"
-else
-    echo "'$GOMA' was not found and may not be supported on this platform!"
-fi

+ 0 - 16
goma_ctl.bat

@@ -1,16 +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.
-
-:: See revert instructions in cipd_manifest.txt
-
-set scriptdir=%~dp0
-
-@call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
-if "%*" == "/?" (
-  @call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_ctl.py --help
-  exit /b
-)
-@call %scriptdir%python-bin\python3.bat %~dp0\.cipd_bin\goma_ctl.py %*
-exit /b %ERRORLEVEL%

+ 0 - 3
update_depot_tools

@@ -144,7 +144,4 @@ if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
     bootstrap_python3
     bootstrap_python3
   fi
   fi
 
 
-  # Restart goma if it is updated.
-  goma_ctl update_hook
 fi
 fi
-

+ 0 - 3
update_depot_tools.bat

@@ -83,6 +83,3 @@ call "%~dp0\cipd_bin_setup.bat"
 
 
 :: Update git and python.
 :: Update git and python.
 call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"
 call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"
-
-:: Restart goma if it is updated.
-call "%~dp0\goma_ctl.bat" update_hook