remove swarming_client

Python client is deprecated.

This removes all references to swarming_client in this repository.
https://source.chromium.org/search?q=swarming_client&sq=&ss=chromium%2Fchromium%2Fsrc:v8%2F

Bug: chromium:984869
Change-Id: I377c47fc696723ae4ba53418682f6e06129812f9
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3114156
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Liviu Rau <liviurau@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/main@{#76452}
This commit is contained in:
Takuto Ikuta 2021-08-24 17:52:19 +09:00 committed by V8 LUCI CQ
parent 2660997331
commit f100a23229
5 changed files with 1 additions and 89 deletions

View File

@ -4,7 +4,6 @@ exclude =
./third_party/, # third-party code ./third_party/, # third-party code
./build/, # third-party code ./build/, # third-party code
./buildtools/, # third-party code ./buildtools/, # third-party code
./tools/swarming_client/, # third-party code
./test/wasm-js/, # third-party code ./test/wasm-js/, # third-party code
./test/wasm-js/data/, # third-party code ./test/wasm-js/data/, # third-party code
./test/test262/data/, # third-party code ./test/test262/data/, # third-party code

1
.gitignore vendored
View File

@ -81,7 +81,6 @@
/tools/luci-go /tools/luci-go
/tools/oom_dump/oom_dump /tools/oom_dump/oom_dump
/tools/oom_dump/oom_dump.o /tools/oom_dump/oom_dump.o
/tools/swarming_client
/tools/turbolizer/build /tools/turbolizer/build
/tools/turbolizer/.rpt2_cache /tools/turbolizer/.rpt2_cache
/tools/turbolizer/deploy /tools/turbolizer/deploy

2
DEPS
View File

@ -314,8 +314,6 @@ deps = {
'condition': 'host_cpu != "s390" and host_os != "aix"', 'condition': 'host_cpu != "s390" and host_os != "aix"',
'dep_type': 'cipd', 'dep_type': 'cipd',
}, },
'tools/swarming_client':
Var('chromium_url') + '/infra/luci/client-py.git' + '@' + 'a32a1607f6093d338f756c7e7c7b4333b0c50c9c',
} }
include_rules = [ include_rules = [

View File

@ -223,8 +223,6 @@ class MetaBuildWrapper(object):
' This can be either a regular path or a ' ' This can be either a regular path or a '
'GN-style source-relative path like ' 'GN-style source-relative path like '
'//out/Default.')) '//out/Default.'))
subp.add_argument('-s', '--swarmed', action='store_true',
help='Run under swarming with the default dimensions')
subp.add_argument('-d', '--dimension', default=[], action='append', nargs=2, subp.add_argument('-d', '--dimension', default=[], action='append', nargs=2,
dest='dimensions', metavar='FOO bar', dest='dimensions', metavar='FOO bar',
help='dimension to filter on') help='dimension to filter on')
@ -356,68 +354,8 @@ class MetaBuildWrapper(object):
if ret: if ret:
return ret return ret
if self.args.swarmed:
return self._RunUnderSwarming(build_dir, target)
else:
return self._RunLocallyIsolated(build_dir, target) return self._RunLocallyIsolated(build_dir, target)
def _RunUnderSwarming(self, build_dir, target):
# TODO(dpranke): Look up the information for the target in
# the //testing/buildbot.json file, if possible, so that we
# can determine the isolate target, command line, and additional
# swarming parameters, if possible.
#
# TODO(dpranke): Also, add support for sharding and merging results.
# TODO(liviurau): While this seems to not be used in V8 yet, we need to add
# a switch for internal try-bots, since they need to use 'chrome-swarming'
cas_instance = 'chromium-swarm'
dimensions = []
for k, v in self._DefaultDimensions() + self.args.dimensions:
dimensions += ['-d', k, v]
archive_json_path = self.ToSrcRelPath(
'%s/%s.archive.json' % (build_dir, target))
cmd = [
self.PathJoin(self.chromium_src_dir, 'tools', 'luci-go',
self.isolate_exe),
'archive',
'-i',
self.ToSrcRelPath('%s/%s.isolate' % (build_dir, target)),
'-cas-instance', cas_instance,
'-dump-json',
archive_json_path,
]
ret, _, _ = self.Run(cmd, force_verbose=False)
if ret:
return ret
try:
archive_hashes = json.loads(self.ReadFile(archive_json_path))
except Exception:
self.Print(
'Failed to read JSON file "%s"' % archive_json_path, file=sys.stderr)
return 1
try:
cas_digest = archive_hashes[target]
except Exception:
self.Print(
'Cannot find hash for "%s" in "%s", file content: %s' %
(target, archive_json_path, archive_hashes),
file=sys.stderr)
return 1
cmd = [
self.executable,
self.PathJoin('tools', 'swarming_client', 'swarming.py'),
'run',
'-digests', cas_digest,
'-S', 'chromium-swarm.appspot.com',
] + dimensions
if self.args.extra_args:
cmd += ['--'] + self.args.extra_args
ret, _, _ = self.Run(cmd, force_verbose=True, buffer_output=False)
return ret
def _RunLocallyIsolated(self, build_dir, target): def _RunLocallyIsolated(self, build_dir, target):
cmd = [ cmd = [
self.PathJoin(self.chromium_src_dir, 'tools', 'luci-go', self.PathJoin(self.chromium_src_dir, 'tools', 'luci-go',

View File

@ -523,28 +523,6 @@ class UnitTest(unittest.TestCase):
self.check(['run', '-c', 'debug_goma', '//out/Default', self.check(['run', '-c', 'debug_goma', '//out/Default',
'base_unittests'], files=files, ret=0) 'base_unittests'], files=files, ret=0)
def test_run_swarmed(self):
files = {
'/fake_src/testing/buildbot/gn_isolate_map.pyl': (
"{'base_unittests': {"
" 'label': '//base:base_unittests',"
" 'type': 'raw',"
" 'args': [],"
"}}\n"
),
'/fake_src/out/Default/base_unittests.runtime_deps': (
"base_unittests\n"
),
'out/Default/base_unittests.archive.json':
("{\"base_unittests\":\"fake_hash\"}"),
}
mbw = self.fake_mbw(files=files)
self.check(['run', '-s', '-c', 'debug_goma', '//out/Default',
'base_unittests'], mbw=mbw, ret=0)
self.check(['run', '-s', '-c', 'debug_goma', '-d', 'os', 'Win7',
'//out/Default', 'base_unittests'], mbw=mbw, ret=0)
def test_lookup(self): def test_lookup(self):
self.check(['lookup', '-c', 'debug_goma'], ret=0, self.check(['lookup', '-c', 'debug_goma'], ret=0,
out=('\n' out=('\n'