You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
depot_tools/recipes/recipe_modules/bot_update/resources/bot_update.py

1182 lines
39 KiB
Python

#!/usr/bin/env python
# Copyright 2014 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.
# TODO(hinoka): Use logging.
from __future__ import print_function
import cStringIO
import codecs
from contextlib import contextmanager
import copy
import ctypes
from datetime import datetime
import functools
import json
import optparse
import os
import pprint
import random
import re
import subprocess
import sys
import tempfile
import threading
import time
import urllib2
import urlparse
import uuid
import os.path as path
# How many bytes at a time to read from pipes.
BUF_SIZE = 256
# How many seconds of no stdout activity before process is considered stale. Can
# be overridden via environment variable `STALE_PROCESS_DURATION`. If set to 0,
# process won't be terminated.
STALE_PROCESS_DURATION = 1200
# Define a bunch of directory paths.
# Relative to this script's filesystem path.
THIS_DIR = path.dirname(path.abspath(__file__))
DEPOT_TOOLS_DIR = path.abspath(path.join(THIS_DIR, '..', '..', '..', '..'))
CHROMIUM_GIT_HOST = 'https://chromium.googlesource.com'
CHROMIUM_SRC_URL = CHROMIUM_GIT_HOST + '/chromium/src.git'
BRANCH_HEADS_REFSPEC = '+refs/branch-heads/*'
TAGS_REFSPEC = '+refs/tags/*'
# Regular expression to match sha1 git revision.
COMMIT_HASH_RE = re.compile(r'[0-9a-f]{5,40}', re.IGNORECASE)
# Regular expression that matches a single commit footer line.
COMMIT_FOOTER_ENTRY_RE = re.compile(r'([^:]+):\s*(.*)')
# Footer metadata keys for regular and gsubtreed mirrored commit positions.
COMMIT_POSITION_FOOTER_KEY = 'Cr-Commit-Position'
COMMIT_ORIGINAL_POSITION_FOOTER_KEY = 'Cr-Original-Commit-Position'
# Copied from scripts/recipes/chromium.py.
GOT_REVISION_MAPPINGS = {
CHROMIUM_SRC_URL: {
'got_revision': 'src/',
'got_nacl_revision': 'src/native_client/',
'got_swarm_client_revision': 'src/tools/swarm_client/',
'got_swarming_client_revision': 'src/tools/swarming_client/',
'got_v8_revision': 'src/v8/',
'got_webkit_revision': 'src/third_party/WebKit/',
'got_webrtc_revision': 'src/third_party/webrtc/',
}
}
GCLIENT_TEMPLATE = """solutions = %(solutions)s
cache_dir = r%(cache_dir)s
%(target_os)s
%(target_os_only)s
%(target_cpu)s
"""
GIT_CACHE_PATH = path.join(DEPOT_TOOLS_DIR, 'git_cache.py')
GCLIENT_PATH = path.join(DEPOT_TOOLS_DIR, 'gclient.py')
class SubprocessFailed(Exception):
def __init__(self, message, code, output):
Exception.__init__(self, message)
self.code = code
self.output = output
class PatchFailed(SubprocessFailed):
pass
class GclientSyncFailed(SubprocessFailed):
pass
class InvalidDiff(Exception):
pass
RETRY = object()
OK = object()
FAIL = object()
class RepeatingTimer(threading.Thread):
"""Call a function every n seconds, unless reset."""
def __init__(self, interval, function, args=None, kwargs=None):
threading.Thread.__init__(self)
self.interval = interval
self.function = function
self.args = args if args is not None else []
self.kwargs = kwargs if kwargs is not None else {}
self.cond = threading.Condition()
self.is_shutdown = False
def reset(self):
"""Resets timer interval."""
with self.cond:
self.is_reset = True
self.cond.notify_all()
def shutdown(self):
"""Stops repeating timer."""
with self.cond:
self.is_shutdown = True
self.cond.notify_all()
def run(self):
with self.cond:
while not self.is_shutdown:
self.cond.wait(self.interval)
if not self.is_reset and not self.is_shutdown:
self.function(*self.args, **self.kwargs)
self.is_reset = False
def _print_pstree():
"""Debugging function used to print "ps auxwwf" for stuck processes."""
if sys.platform.startswith('linux2'):
# Add new line for cleaner output
print()
subprocess.call(['ps', 'auxwwf'])
def _terminate_process(proc):
print('Terminating stale process...')
proc.terminate()
def call(*args, **kwargs): # pragma: no cover
"""Interactive subprocess call."""
kwargs['stdout'] = subprocess.PIPE
kwargs['stderr'] = subprocess.STDOUT
kwargs.setdefault('bufsize', BUF_SIZE)
cwd = kwargs.get('cwd', os.getcwd())
stdin_data = kwargs.pop('stdin_data', None)
if stdin_data:
kwargs['stdin'] = subprocess.PIPE
out = cStringIO.StringIO()
new_env = kwargs.get('env', {})
env = os.environ.copy()
env.update(new_env)
kwargs['env'] = env
if new_env:
print('===Injecting Environment Variables===')
for k, v in sorted(new_env.items()):
print('%s: %s' % (k, v))
print('%s ===Running %s ===' % (datetime.now(), ' '.join(args),))
print('In directory: %s' % cwd)
start_time = time.time()
proc = subprocess.Popen(args, **kwargs)
if stdin_data:
proc.stdin.write(stdin_data)
proc.stdin.close()
stale_process_duration = env.get('STALE_PROCESS_DURATION',
STALE_PROCESS_DURATION)
observers = [
RepeatingTimer(300, _print_pstree),
RepeatingTimer(int(stale_process_duration), _terminate_process, [proc])]
for observer in observers:
observer.start()
# This is here because passing 'sys.stdout' into stdout for proc will
# produce out of order output.
hanging_cr = False
while True:
for observer in observers:
observer.reset()
buf = proc.stdout.read(BUF_SIZE)
if not buf:
break
if hanging_cr:
buf = '\r' + buf
hanging_cr = buf.endswith('\r')
if hanging_cr:
buf = buf[:-1]
buf = buf.replace('\r\n', '\n').replace('\r', '\n')
sys.stdout.write(buf)
out.write(buf)
if hanging_cr:
sys.stdout.write('\n')
out.write('\n')
for observer in observers:
observer.shutdown()
code = proc.wait()
elapsed_time = ((time.time() - start_time) / 60.0)
outval = out.getvalue()
if code:
print('%s ===Failed in %.1f mins of %s ===' %
(datetime.now(), elapsed_time, ' '.join(args)))
print()
raise SubprocessFailed('%s failed with code %d in %s.' %
(' '.join(args), code, cwd),
code, outval)
print('%s ===Succeeded in %.1f mins of %s ===' %
(datetime.now(), elapsed_time, ' '.join(args)))
print()
return outval
def git(*args, **kwargs): # pragma: no cover
"""Wrapper around call specifically for Git commands."""
if args and args[0] == 'cache':
# Rewrite "git cache" calls into "python git_cache.py".
cmd = (sys.executable, '-u', GIT_CACHE_PATH) + args[1:]
else:
git_executable = 'git'
# On windows, subprocess doesn't fuzzy-match 'git' to 'git.bat', so we
# have to do it explicitly. This is better than passing shell=True.
if sys.platform.startswith('win'):
git_executable += '.bat'
cmd = (git_executable,) + args
return call(*cmd, **kwargs)
def get_gclient_spec(solutions, target_os, target_os_only, target_cpu,
git_cache_dir):
return GCLIENT_TEMPLATE % {
'solutions': pprint.pformat(solutions, indent=4),
'cache_dir': '"%s"' % git_cache_dir,
'target_os': ('\ntarget_os=%s' % target_os) if target_os else '',
'target_os_only': '\ntarget_os_only=%s' % target_os_only,
'target_cpu': ('\ntarget_cpu=%s' % target_cpu) if target_cpu else ''
}
def solutions_printer(solutions):
"""Prints gclient solution to stdout."""
print('Gclient Solutions')
print('=================')
for solution in solutions:
name = solution.get('name')
url = solution.get('url')
print('%s (%s)' % (name, url))
if solution.get('deps_file'):
print(' Dependencies file is %s' % solution['deps_file'])
if 'managed' in solution:
print(' Managed mode is %s' % ('ON' if solution['managed'] else 'OFF'))
custom_vars = solution.get('custom_vars')
if custom_vars:
print(' Custom Variables:')
for var_name, var_value in sorted(custom_vars.items()):
print(' %s = %s' % (var_name, var_value))
custom_deps = solution.get('custom_deps')
if 'custom_deps' in solution:
print(' Custom Dependencies:')
for deps_name, deps_value in sorted(custom_deps.items()):
if deps_value:
print(' %s -> %s' % (deps_name, deps_value))
else:
print(' %s: Ignore' % deps_name)
for k, v in solution.items():
# Print out all the keys we don't know about.
if k in ['name', 'url', 'deps_file', 'custom_vars', 'custom_deps',
'managed']:
continue
print(' %s is %s' % (k, v))
print()
def modify_solutions(input_solutions):
"""Modifies urls in solutions to point at Git repos.
returns: new solution dictionary
"""
assert input_solutions
solutions = copy.deepcopy(input_solutions)
for solution in solutions:
original_url = solution['url']
parsed_url = urlparse.urlparse(original_url)
parsed_path = parsed_url.path
solution['managed'] = False
# We don't want gclient to be using a safesync URL. Instead it should
# using the lkgr/lkcr branch/tags.
if 'safesync_url' in solution:
print('Removing safesync url %s from %s' % (solution['safesync_url'],
parsed_path))
del solution['safesync_url']
return solutions
def remove(target, cleanup_dir):
"""Remove a target by moving it into cleanup_dir."""
if not path.exists(cleanup_dir):
os.makedirs(cleanup_dir)
dest = path.join(cleanup_dir, '%s_%s' % (
path.basename(target), uuid.uuid4().hex))
print('Marking for removal %s => %s' % (target, dest))
try:
os.rename(target, dest)
except Exception as e:
print('Error renaming %s to %s: %s' % (target, dest, str(e)))
raise
def ensure_no_checkout(dir_names, cleanup_dir):
"""Ensure that there is no undesired checkout under build/."""
build_dir = os.getcwd()
has_checkout = any(path.exists(path.join(build_dir, dir_name, '.git'))
for dir_name in dir_names)
if has_checkout:
for filename in os.listdir(build_dir):
deletion_target = path.join(build_dir, filename)
print('.git detected in checkout, deleting %s...' % deletion_target,)
remove(deletion_target, cleanup_dir)
print('done')
def call_gclient(*args, **kwargs):
"""Run the "gclient.py" tool with the supplied arguments.
Args:
args: command-line arguments to pass to gclient.
kwargs: keyword arguments to pass to call.
"""
Revert "Reland "depot_tools: Move six to depot_tools' .vpython"" This reverts commit d52b306f84eaf9e5e8be0f22536a3f589b010ae6. Reason for revert: Broke ANGLE CQ with "ImportError: No module named six" Example: https://ci.chromium.org/p/angle/builders/try/mac-dbg/6758 Original change's description: > Reland "depot_tools: Move six to depot_tools' .vpython" > > This is a reland of 3a98df0bdd49d64cb15a5dd0fbc6b43223856e7d > > Original change's description: > > depot_tools: Move six to depot_tools' .vpython > > > > Bug: 984182 > > Change-Id: I34a242c8607624beb0f06a27c563e413dec99790 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1717492 > > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> > > Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org> > > Reviewed-by: Robbie Iannucci <iannucci@chromium.org> > > Reviewed-by: Michael Moss <mmoss@chromium.org> > > Bug: 984182 > Change-Id: Ibf7034201e65a18f833cf1e7432f81a903a99aae > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1732880 > Reviewed-by: Robbie Iannucci <iannucci@chromium.org> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> TBR=iannucci@chromium.org,mmoss@chromium.org,tandrii@chromium.org,ehmaldonado@chromium.org Change-Id: Id4488249b607441df9f00aa51f4a1f2bc4ad5cfd No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 984182 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1739582 Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Kenneth Russell <kbr@chromium.org>
6 years ago
cmd = [sys.executable, '-u', GCLIENT_PATH]
cmd.extend(args)
return call(*cmd, **kwargs)
def gclient_configure(solutions, target_os, target_os_only, target_cpu,
git_cache_dir):
"""Should do the same thing as gclient --spec='...'."""
with codecs.open('.gclient', mode='w', encoding='utf-8') as f:
f.write(get_gclient_spec(
solutions, target_os, target_os_only, target_cpu, git_cache_dir))
@contextmanager
def git_config_if_not_set(key, value):
"""Set git config for key equal to value if key was not set.
If key was not set, unset it once we're done."""
should_unset = True
try:
git('config', '--global', key)
should_unset = False
except SubprocessFailed as e:
git('config', '--global', key, value)
try:
yield
finally:
if should_unset:
git('config', '--global', '--unset', key)
def gclient_sync(
with_branch_heads, with_tags, revisions,
patch_refs, gerrit_reset,
gerrit_rebase_patch_ref):
args = ['sync', '--verbose', '--reset', '--force',
'--nohooks', '--noprehooks', '--delete_unversioned_trees']
if with_branch_heads:
args += ['--with_branch_heads']
if with_tags:
args += ['--with_tags']
for name, revision in sorted(revisions.items()):
if revision.upper() == 'HEAD':
revision = 'refs/remotes/origin/master'
args.extend(['--revision', '%s@%s' % (name, revision)])
if patch_refs:
for patch_ref in patch_refs:
args.extend(['--patch-ref', patch_ref])
if not gerrit_reset:
args.append('--no-reset-patch-ref')
if not gerrit_rebase_patch_ref:
args.append('--no-rebase-patch-ref')
try:
call_gclient(*args)
except SubprocessFailed as e:
# If gclient sync is handling patching, parse the output for a patch error
# message.
if 'Failed to apply patch.' in e.output:
raise PatchFailed(e.message, e.code, e.output)
# Throw a GclientSyncFailed exception so we can catch this independently.
raise GclientSyncFailed(e.message, e.code, e.output)
def normalize_git_url(url):
"""Normalize a git url to be consistent.
This recognizes urls to the googlesoruce.com domain. It ensures that
the url:
* Do not end in .git
* Do not contain /a/ in their path.
"""
try:
p = urlparse.urlparse(url)
except Exception:
# Not a url, just return it back.
return url
if not p.netloc.endswith('.googlesource.com'):
# Not a googlesource.com URL, can't normalize this, just return as is.
return url
upath = p.path
if upath.startswith('/a'):
upath = upath[len('/a'):]
if upath.endswith('.git'):
upath = upath[:-len('.git')]
return 'https://%s%s' % (p.netloc, upath)
def create_manifest():
fd, fname = tempfile.mkstemp()
os.close(fd)
try:
revinfo = call_gclient(
'revinfo', '-a', '--ignore-dep-type', 'cipd', '--output-json', fname)
with open(fname) as f:
return {
path: {
'repository': info['url'],
'revision': info['rev'],
}
for path, info in json.load(f).items()
if info['rev'] is not None
}
except ValueError, SubprocessFailed:
return {}
finally:
os.remove(fname)
def get_commit_message_footer_map(message):
"""Returns: (dict) A dictionary of commit message footer entries.
"""
footers = {}
# Extract the lines in the footer block.
lines = []
for line in message.strip().splitlines():
line = line.strip()
if len(line) == 0:
del lines[:]
continue
lines.append(line)
# Parse the footer
for line in lines:
m = COMMIT_FOOTER_ENTRY_RE.match(line)
if not m:
# If any single line isn't valid, continue anyway for compatibility with
# Gerrit (which itself uses JGit for this).
continue
footers[m.group(1)] = m.group(2).strip()
return footers
def get_commit_message_footer(message, key):
"""Returns: (str/None) The footer value for 'key', or None if none was found.
"""
return get_commit_message_footer_map(message).get(key)
# Derived from:
# http://code.activestate.com/recipes/577972-disk-usage/?in=user-4178764
def get_total_disk_space():
cwd = os.getcwd()
# Windows is the only platform that doesn't support os.statvfs, so
# we need to special case this.
if sys.platform.startswith('win'):
_, total, free = (ctypes.c_ulonglong(), ctypes.c_ulonglong(), \
ctypes.c_ulonglong())
if sys.version_info >= (3,) or isinstance(cwd, unicode):
fn = ctypes.windll.kernel32.GetDiskFreeSpaceExW
else:
fn = ctypes.windll.kernel32.GetDiskFreeSpaceExA
ret = fn(cwd, ctypes.byref(_), ctypes.byref(total), ctypes.byref(free))
if ret == 0:
# WinError() will fetch the last error code.
raise ctypes.WinError()
return (total.value, free.value)
else:
st = os.statvfs(cwd)
free = st.f_bavail * st.f_frsize
total = st.f_blocks * st.f_frsize
return (total, free)
def ref_to_remote_ref(ref):
"""Maps refs to equivalent remote ref.
This maps
- refs/heads/BRANCH -> refs/remotes/origin/BRANCH
- refs/branch-heads/BRANCH_HEAD -> refs/remotes/branch-heads/BRANCH_HEAD
- origin/BRANCH -> refs/remotes/origin/BRANCH
and leaves other refs unchanged.
"""
if ref.startswith('refs/heads/'):
return 'refs/remotes/origin/' + ref[len('refs/heads/'):]
elif ref.startswith('refs/branch-heads/'):
return 'refs/remotes/branch-heads/' + ref[len('refs/branch-heads/'):]
elif ref.startswith('origin/'):
return 'refs/remotes/' + ref
else:
return ref
def get_target_branch_and_revision(solution_name, git_url, revisions):
solution_name = solution_name.strip('/')
configured = revisions.get(solution_name) or revisions.get(git_url)
if configured is None or COMMIT_HASH_RE.match(configured):
# TODO(crbug.com/1104182): Get the default branch instead of assuming
# 'master'.
branch = 'refs/remotes/origin/master'
revision = configured or 'HEAD'
return branch, revision
elif ':' in configured:
branch, revision = configured.split(':', 1)
else:
branch = configured
revision = 'HEAD'
if not branch.startswith(('refs/', 'origin/')):
branch = 'refs/remotes/origin/' + branch
branch = ref_to_remote_ref(branch)
return branch, revision
def _has_in_git_cache(revision_sha1, refs, git_cache_dir, url):
bot_update: optimize checkout of solution's main repo. Goal: reduce number of git fetches from remote to the minimum possible. Minimum possible is either: * 0 if desired revision is pinned (!= HEAD) and already exists in cache * 1 if desired revision is HEAD * >= 2 if revision is pinned but we talk temporarily out-of-date git server not yet having it. This CL achieves the above. No fetch: https://ci.chromium.org/swarming/task/39dad20230c84110?server=chromium-swarm.appspot.com bot_update takes <1min, but it used to take at least 2. The steps are now like this: ... ===Running git cat-file -e 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== In directory: /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running /b/swarming/w/ir/cipd_bin_packages/bin/python -u /b/swarming/w/ir/recipe-checkout-dir/depot_tools/git_cache.py exists --quiet --cache-dir /b/swarming/w/ir/cache/git https://chromium.googlesource.com/chromium/src.git=== In directory: /b/swarming/w/ir/cache/builder/linux /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running git remote set-url origin /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src=== In directory: /b/swarming/w/ir/cache/builder/linux/src ===Succeeded in 0.0 mins=== ===Running git fetch origin=== In directory: /b/swarming/w/ir/cache/builder/linux/src From /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src 003eedbfee47..5210107a20e8 master -> origin/master ===Succeeded in 0.0 mins=== ===Running git checkout --force 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== ... Fetch & success: https://ci.chromium.org/swarming/task/39db022b874ffd10?server=chromium-swarm.appspot.com Fetch & retry because missing rev: https://ci.chromium.org/swarming/task/39db04ce8b4b8910?server=chromium-swarm.appspot.com Fetch because rev=HEAD: https://ci.chromium.org/swarming/task/39db0c0dd5ab5d10?server=chromium-swarm.appspot.com This has already been adopted in gclient. Bug: Change-Id: Id99892b62719fdf3f7e6e59058986d1500384f8d Reviewed-on: https://chromium-review.googlesource.com/771591 Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org> Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
8 years ago
"""Returns whether given revision_sha1 is contained in cache of a given repo.
"""
try:
mirror_dir = git(
'cache', 'exists', '--quiet', '--cache-dir', git_cache_dir, url).strip()
if revision_sha1:
git('cat-file', '-e', revision_sha1, cwd=mirror_dir)
for ref in refs:
git('cat-file', '-e', ref, cwd=mirror_dir)
bot_update: optimize checkout of solution's main repo. Goal: reduce number of git fetches from remote to the minimum possible. Minimum possible is either: * 0 if desired revision is pinned (!= HEAD) and already exists in cache * 1 if desired revision is HEAD * >= 2 if revision is pinned but we talk temporarily out-of-date git server not yet having it. This CL achieves the above. No fetch: https://ci.chromium.org/swarming/task/39dad20230c84110?server=chromium-swarm.appspot.com bot_update takes <1min, but it used to take at least 2. The steps are now like this: ... ===Running git cat-file -e 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== In directory: /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running /b/swarming/w/ir/cipd_bin_packages/bin/python -u /b/swarming/w/ir/recipe-checkout-dir/depot_tools/git_cache.py exists --quiet --cache-dir /b/swarming/w/ir/cache/git https://chromium.googlesource.com/chromium/src.git=== In directory: /b/swarming/w/ir/cache/builder/linux /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running git remote set-url origin /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src=== In directory: /b/swarming/w/ir/cache/builder/linux/src ===Succeeded in 0.0 mins=== ===Running git fetch origin=== In directory: /b/swarming/w/ir/cache/builder/linux/src From /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src 003eedbfee47..5210107a20e8 master -> origin/master ===Succeeded in 0.0 mins=== ===Running git checkout --force 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== ... Fetch & success: https://ci.chromium.org/swarming/task/39db022b874ffd10?server=chromium-swarm.appspot.com Fetch & retry because missing rev: https://ci.chromium.org/swarming/task/39db04ce8b4b8910?server=chromium-swarm.appspot.com Fetch because rev=HEAD: https://ci.chromium.org/swarming/task/39db0c0dd5ab5d10?server=chromium-swarm.appspot.com This has already been adopted in gclient. Bug: Change-Id: Id99892b62719fdf3f7e6e59058986d1500384f8d Reviewed-on: https://chromium-review.googlesource.com/771591 Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org> Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
8 years ago
return True
except SubprocessFailed:
return False
def is_broken_repo_dir(repo_dir):
# Treat absence of 'config' as a signal of a partially deleted repo.
return not path.exists(os.path.join(repo_dir, '.git', 'config'))
def _maybe_break_locks(checkout_path, tries=3):
"""This removes all .lock files from this repo's .git directory.
In particular, this will cleanup index.lock files, as well as ref lock
files.
"""
def attempt():
git_dir = os.path.join(checkout_path, '.git')
for dirpath, _, filenames in os.walk(git_dir):
for filename in filenames:
if filename.endswith('.lock'):
to_break = os.path.join(dirpath, filename)
print('breaking lock: %s' % to_break)
try:
os.remove(to_break)
except OSError as ex:
print('FAILED to break lock: %s: %s' % (to_break, ex))
raise
for _ in xrange(tries):
try:
attempt()
return
except Exception:
pass
def _set_git_config(fn):
@functools.wraps(fn)
def wrapper(*args, **kwargs):
with git_config_if_not_set('user.name', 'chrome-bot'), \
git_config_if_not_set('user.email', 'chrome-bot@chromium.org'), \
git_config_if_not_set('fetch.uriprotocols', 'https'):
return fn(*args, **kwargs)
return wrapper
Allow the bot_update api to not fetch tags from the git server. There are 3 layers modified, starting from the bottom up: 1. git_cache.py populate Now takes a --no-fetch-tags option. If specified, the cache will not fetch updated tags from the server by passing --no-tags to git fetch. This prevents the server from sending all the tag refs. In chromium this prevents significant time bottlenecks dealing with 10k+ tags. 2. bot_update.py bot_update has to deal with multiple git repos, it has the root repo that is checked out through git-cache, as well as repos synched via DEPS and gclient. The script now takes a --no_fetch_tags option. If specified, the git-cache populate call will include --no-fetch-tags. Otherwise, it won't. So this controls (for chromium) if fetches to the src.git server are passed --no-tags. 3. bot_update/api.py This is the entry point for recipes and also has to deal with multiple git repos. The behaviour at this point is not changed from the default. A |no_fetch_tags| parameter is added to ensure_checkout() that defaults to False. This CL is a refactor with no intended behavior change. The next step will be to change the chromium build repo to pass True for ensure_checkout(no_fetch_tags) on chromium trybots. This represents solution #2 in https://docs.google.com/document/d/1hDIunJjjfpmr50y3YnZ4o3aq1NZF4gJa1TS0p7AIL64/edit# Bug: 1019824 Change-Id: I935430603299daa9e301a95a5184c0ce486fd912 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1894352 Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Auto-Submit: danakj <danakj@chromium.org>
6 years ago
def git_checkouts(solutions, revisions, refs, no_fetch_tags, git_cache_dir,
Reland "Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache"" This is a reland of 3774c589cb395e9949f5e7d92f837e4a424617d8 Added missing options.enforce_fetch arg Confirmed via a fake test roll with this CL's patch commit that the bot_update step passes with this change: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2443649 Original change's description: > Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache" > > This is a reland of f38f54f2f1a3121643d86abab9e6ebe597238d9b > > Original change's description: > > Add optional enforce_fetch kwarg to fetch and refresh git cache > > > > Allows builders to do a force refresh of the git cache to ensure a new > > fetch happens. android-binary-size needs this to get an accurate diff > > of the passed in src revision and the applied patch: > > https://bugs.chromium.org/p/chromium/issues/detail?id=1129235#c19 > > > > Bug: 1129235 > > Change-Id: I993521cdde2a491fc9d42d75ff28dedcd2cea64e > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2438802 > > Commit-Queue: Stephanie Kim <kimstephanie@google.com> > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Bug: 1129235 > Change-Id: I034a91a8b57821d08b10042f7fc94d32350540ba > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443235 > Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org> > Commit-Queue: Stephanie Kim <kimstephanie@google.com> Bug: 1129235 Change-Id: Ibbd4535f8529243d2dc1d4d32881d8a61efe374a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443574 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Stephanie Kim <kimstephanie@google.com>
5 years ago
cleanup_dir, enforce_fetch):
build_dir = os.getcwd()
first_solution = True
for sln in solutions:
sln_dir = path.join(build_dir, sln['name'])
Allow the bot_update api to not fetch tags from the git server. There are 3 layers modified, starting from the bottom up: 1. git_cache.py populate Now takes a --no-fetch-tags option. If specified, the cache will not fetch updated tags from the server by passing --no-tags to git fetch. This prevents the server from sending all the tag refs. In chromium this prevents significant time bottlenecks dealing with 10k+ tags. 2. bot_update.py bot_update has to deal with multiple git repos, it has the root repo that is checked out through git-cache, as well as repos synched via DEPS and gclient. The script now takes a --no_fetch_tags option. If specified, the git-cache populate call will include --no-fetch-tags. Otherwise, it won't. So this controls (for chromium) if fetches to the src.git server are passed --no-tags. 3. bot_update/api.py This is the entry point for recipes and also has to deal with multiple git repos. The behaviour at this point is not changed from the default. A |no_fetch_tags| parameter is added to ensure_checkout() that defaults to False. This CL is a refactor with no intended behavior change. The next step will be to change the chromium build repo to pass True for ensure_checkout(no_fetch_tags) on chromium trybots. This represents solution #2 in https://docs.google.com/document/d/1hDIunJjjfpmr50y3YnZ4o3aq1NZF4gJa1TS0p7AIL64/edit# Bug: 1019824 Change-Id: I935430603299daa9e301a95a5184c0ce486fd912 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1894352 Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Auto-Submit: danakj <danakj@chromium.org>
6 years ago
_git_checkout(sln, sln_dir, revisions, refs, no_fetch_tags, git_cache_dir,
Reland "Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache"" This is a reland of 3774c589cb395e9949f5e7d92f837e4a424617d8 Added missing options.enforce_fetch arg Confirmed via a fake test roll with this CL's patch commit that the bot_update step passes with this change: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2443649 Original change's description: > Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache" > > This is a reland of f38f54f2f1a3121643d86abab9e6ebe597238d9b > > Original change's description: > > Add optional enforce_fetch kwarg to fetch and refresh git cache > > > > Allows builders to do a force refresh of the git cache to ensure a new > > fetch happens. android-binary-size needs this to get an accurate diff > > of the passed in src revision and the applied patch: > > https://bugs.chromium.org/p/chromium/issues/detail?id=1129235#c19 > > > > Bug: 1129235 > > Change-Id: I993521cdde2a491fc9d42d75ff28dedcd2cea64e > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2438802 > > Commit-Queue: Stephanie Kim <kimstephanie@google.com> > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Bug: 1129235 > Change-Id: I034a91a8b57821d08b10042f7fc94d32350540ba > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443235 > Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org> > Commit-Queue: Stephanie Kim <kimstephanie@google.com> Bug: 1129235 Change-Id: Ibbd4535f8529243d2dc1d4d32881d8a61efe374a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443574 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Stephanie Kim <kimstephanie@google.com>
5 years ago
cleanup_dir, enforce_fetch)
if first_solution:
git_ref = git('log', '--format=%H', '--max-count=1',
cwd=path.join(build_dir, sln['name'])
).strip()
first_solution = False
return git_ref
Allow the bot_update api to not fetch tags from the git server. There are 3 layers modified, starting from the bottom up: 1. git_cache.py populate Now takes a --no-fetch-tags option. If specified, the cache will not fetch updated tags from the server by passing --no-tags to git fetch. This prevents the server from sending all the tag refs. In chromium this prevents significant time bottlenecks dealing with 10k+ tags. 2. bot_update.py bot_update has to deal with multiple git repos, it has the root repo that is checked out through git-cache, as well as repos synched via DEPS and gclient. The script now takes a --no_fetch_tags option. If specified, the git-cache populate call will include --no-fetch-tags. Otherwise, it won't. So this controls (for chromium) if fetches to the src.git server are passed --no-tags. 3. bot_update/api.py This is the entry point for recipes and also has to deal with multiple git repos. The behaviour at this point is not changed from the default. A |no_fetch_tags| parameter is added to ensure_checkout() that defaults to False. This CL is a refactor with no intended behavior change. The next step will be to change the chromium build repo to pass True for ensure_checkout(no_fetch_tags) on chromium trybots. This represents solution #2 in https://docs.google.com/document/d/1hDIunJjjfpmr50y3YnZ4o3aq1NZF4gJa1TS0p7AIL64/edit# Bug: 1019824 Change-Id: I935430603299daa9e301a95a5184c0ce486fd912 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1894352 Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Auto-Submit: danakj <danakj@chromium.org>
6 years ago
def _git_checkout(sln, sln_dir, revisions, refs, no_fetch_tags, git_cache_dir,
Reland "Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache"" This is a reland of 3774c589cb395e9949f5e7d92f837e4a424617d8 Added missing options.enforce_fetch arg Confirmed via a fake test roll with this CL's patch commit that the bot_update step passes with this change: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2443649 Original change's description: > Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache" > > This is a reland of f38f54f2f1a3121643d86abab9e6ebe597238d9b > > Original change's description: > > Add optional enforce_fetch kwarg to fetch and refresh git cache > > > > Allows builders to do a force refresh of the git cache to ensure a new > > fetch happens. android-binary-size needs this to get an accurate diff > > of the passed in src revision and the applied patch: > > https://bugs.chromium.org/p/chromium/issues/detail?id=1129235#c19 > > > > Bug: 1129235 > > Change-Id: I993521cdde2a491fc9d42d75ff28dedcd2cea64e > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2438802 > > Commit-Queue: Stephanie Kim <kimstephanie@google.com> > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Bug: 1129235 > Change-Id: I034a91a8b57821d08b10042f7fc94d32350540ba > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443235 > Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org> > Commit-Queue: Stephanie Kim <kimstephanie@google.com> Bug: 1129235 Change-Id: Ibbd4535f8529243d2dc1d4d32881d8a61efe374a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443574 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Stephanie Kim <kimstephanie@google.com>
5 years ago
cleanup_dir, enforce_fetch):
name = sln['name']
url = sln['url']
branch, revision = get_target_branch_and_revision(name, url, revisions)
pin = revision if COMMIT_HASH_RE.match(revision) else None
populate_cmd = (['cache', 'populate', '-v', '--cache-dir', git_cache_dir, url,
'--reset-fetch-config'])
Allow the bot_update api to not fetch tags from the git server. There are 3 layers modified, starting from the bottom up: 1. git_cache.py populate Now takes a --no-fetch-tags option. If specified, the cache will not fetch updated tags from the server by passing --no-tags to git fetch. This prevents the server from sending all the tag refs. In chromium this prevents significant time bottlenecks dealing with 10k+ tags. 2. bot_update.py bot_update has to deal with multiple git repos, it has the root repo that is checked out through git-cache, as well as repos synched via DEPS and gclient. The script now takes a --no_fetch_tags option. If specified, the git-cache populate call will include --no-fetch-tags. Otherwise, it won't. So this controls (for chromium) if fetches to the src.git server are passed --no-tags. 3. bot_update/api.py This is the entry point for recipes and also has to deal with multiple git repos. The behaviour at this point is not changed from the default. A |no_fetch_tags| parameter is added to ensure_checkout() that defaults to False. This CL is a refactor with no intended behavior change. The next step will be to change the chromium build repo to pass True for ensure_checkout(no_fetch_tags) on chromium trybots. This represents solution #2 in https://docs.google.com/document/d/1hDIunJjjfpmr50y3YnZ4o3aq1NZF4gJa1TS0p7AIL64/edit# Bug: 1019824 Change-Id: I935430603299daa9e301a95a5184c0ce486fd912 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1894352 Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Auto-Submit: danakj <danakj@chromium.org>
6 years ago
if no_fetch_tags:
populate_cmd.extend(['--no-fetch-tags'])
if pin:
populate_cmd.extend(['--commit', pin])
for ref in refs:
populate_cmd.extend(['--ref', ref])
env = {}
if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
# This is for performance investigation of `git fetch` in chromium/src.
env = {
'GIT_TRACE': 'true',
'GIT_TRACE_PERFORMANCE': 'true',
'GIT_TRACE_CURL': 'true',
'GIT_TRACE_CURL_NO_DATA': 'true',
'GIT_REDACT_COOKIES': 'o,SSO,GSSO_UberProxy,__Secure-GSSO_UberProxy',
}
bot_update: optimize checkout of solution's main repo. Goal: reduce number of git fetches from remote to the minimum possible. Minimum possible is either: * 0 if desired revision is pinned (!= HEAD) and already exists in cache * 1 if desired revision is HEAD * >= 2 if revision is pinned but we talk temporarily out-of-date git server not yet having it. This CL achieves the above. No fetch: https://ci.chromium.org/swarming/task/39dad20230c84110?server=chromium-swarm.appspot.com bot_update takes <1min, but it used to take at least 2. The steps are now like this: ... ===Running git cat-file -e 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== In directory: /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running /b/swarming/w/ir/cipd_bin_packages/bin/python -u /b/swarming/w/ir/recipe-checkout-dir/depot_tools/git_cache.py exists --quiet --cache-dir /b/swarming/w/ir/cache/git https://chromium.googlesource.com/chromium/src.git=== In directory: /b/swarming/w/ir/cache/builder/linux /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running git remote set-url origin /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src=== In directory: /b/swarming/w/ir/cache/builder/linux/src ===Succeeded in 0.0 mins=== ===Running git fetch origin=== In directory: /b/swarming/w/ir/cache/builder/linux/src From /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src 003eedbfee47..5210107a20e8 master -> origin/master ===Succeeded in 0.0 mins=== ===Running git checkout --force 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== ... Fetch & success: https://ci.chromium.org/swarming/task/39db022b874ffd10?server=chromium-swarm.appspot.com Fetch & retry because missing rev: https://ci.chromium.org/swarming/task/39db04ce8b4b8910?server=chromium-swarm.appspot.com Fetch because rev=HEAD: https://ci.chromium.org/swarming/task/39db0c0dd5ab5d10?server=chromium-swarm.appspot.com This has already been adopted in gclient. Bug: Change-Id: Id99892b62719fdf3f7e6e59058986d1500384f8d Reviewed-on: https://chromium-review.googlesource.com/771591 Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org> Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
8 years ago
# Step 1: populate/refresh cache, if necessary.
if enforce_fetch or not pin:
git(*populate_cmd, env=env)
# If cache still doesn't have required pin/refs, try again and fetch pin/refs
# directly.
if not _has_in_git_cache(pin, refs, git_cache_dir, url):
for attempt in range(3):
with git_config_if_not_set(
'http.extraheader', 'X-Return-Encrypted-Headers: all'):
git(*populate_cmd, env=env)
if _has_in_git_cache(pin, refs, git_cache_dir, url):
break
print('Some required refs/commits are still not present.')
print('Waiting 60s and trying again.')
time.sleep(60)
bot_update: optimize checkout of solution's main repo. Goal: reduce number of git fetches from remote to the minimum possible. Minimum possible is either: * 0 if desired revision is pinned (!= HEAD) and already exists in cache * 1 if desired revision is HEAD * >= 2 if revision is pinned but we talk temporarily out-of-date git server not yet having it. This CL achieves the above. No fetch: https://ci.chromium.org/swarming/task/39dad20230c84110?server=chromium-swarm.appspot.com bot_update takes <1min, but it used to take at least 2. The steps are now like this: ... ===Running git cat-file -e 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== In directory: /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running /b/swarming/w/ir/cipd_bin_packages/bin/python -u /b/swarming/w/ir/recipe-checkout-dir/depot_tools/git_cache.py exists --quiet --cache-dir /b/swarming/w/ir/cache/git https://chromium.googlesource.com/chromium/src.git=== In directory: /b/swarming/w/ir/cache/builder/linux /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running git remote set-url origin /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src=== In directory: /b/swarming/w/ir/cache/builder/linux/src ===Succeeded in 0.0 mins=== ===Running git fetch origin=== In directory: /b/swarming/w/ir/cache/builder/linux/src From /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src 003eedbfee47..5210107a20e8 master -> origin/master ===Succeeded in 0.0 mins=== ===Running git checkout --force 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== ... Fetch & success: https://ci.chromium.org/swarming/task/39db022b874ffd10?server=chromium-swarm.appspot.com Fetch & retry because missing rev: https://ci.chromium.org/swarming/task/39db04ce8b4b8910?server=chromium-swarm.appspot.com Fetch because rev=HEAD: https://ci.chromium.org/swarming/task/39db0c0dd5ab5d10?server=chromium-swarm.appspot.com This has already been adopted in gclient. Bug: Change-Id: Id99892b62719fdf3f7e6e59058986d1500384f8d Reviewed-on: https://chromium-review.googlesource.com/771591 Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org> Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
8 years ago
# Step 2: populate a checkout from local cache. All operations are local.
mirror_dir = git(
'cache', 'exists', '--quiet', '--cache-dir', git_cache_dir, url).strip()
_set_remote_head(mirror_dir)
bot_update: optimize checkout of solution's main repo. Goal: reduce number of git fetches from remote to the minimum possible. Minimum possible is either: * 0 if desired revision is pinned (!= HEAD) and already exists in cache * 1 if desired revision is HEAD * >= 2 if revision is pinned but we talk temporarily out-of-date git server not yet having it. This CL achieves the above. No fetch: https://ci.chromium.org/swarming/task/39dad20230c84110?server=chromium-swarm.appspot.com bot_update takes <1min, but it used to take at least 2. The steps are now like this: ... ===Running git cat-file -e 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== In directory: /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running /b/swarming/w/ir/cipd_bin_packages/bin/python -u /b/swarming/w/ir/recipe-checkout-dir/depot_tools/git_cache.py exists --quiet --cache-dir /b/swarming/w/ir/cache/git https://chromium.googlesource.com/chromium/src.git=== In directory: /b/swarming/w/ir/cache/builder/linux /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running git remote set-url origin /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src=== In directory: /b/swarming/w/ir/cache/builder/linux/src ===Succeeded in 0.0 mins=== ===Running git fetch origin=== In directory: /b/swarming/w/ir/cache/builder/linux/src From /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src 003eedbfee47..5210107a20e8 master -> origin/master ===Succeeded in 0.0 mins=== ===Running git checkout --force 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== ... Fetch & success: https://ci.chromium.org/swarming/task/39db022b874ffd10?server=chromium-swarm.appspot.com Fetch & retry because missing rev: https://ci.chromium.org/swarming/task/39db04ce8b4b8910?server=chromium-swarm.appspot.com Fetch because rev=HEAD: https://ci.chromium.org/swarming/task/39db0c0dd5ab5d10?server=chromium-swarm.appspot.com This has already been adopted in gclient. Bug: Change-Id: Id99892b62719fdf3f7e6e59058986d1500384f8d Reviewed-on: https://chromium-review.googlesource.com/771591 Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org> Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
8 years ago
first_try = True
while True:
try:
# If repo deletion was aborted midway, it may have left .git in broken
# state.
if path.exists(sln_dir) and is_broken_repo_dir(sln_dir):
print('Git repo %s appears to be broken, removing it' % sln_dir)
remove(sln_dir, cleanup_dir)
# Use "tries=1", since we retry manually in this loop.
if not path.isdir(sln_dir):
git('clone', '--no-checkout', '--local', '--shared', mirror_dir,
sln_dir)
_git_disable_gc(sln_dir)
else:
_git_disable_gc(sln_dir)
git('remote', 'set-url', 'origin', mirror_dir, cwd=sln_dir)
git('fetch', 'origin', cwd=sln_dir)
git('remote', 'set-url', '--push', 'origin', url, cwd=sln_dir)
_set_remote_head(sln_dir)
if pin:
git('fetch', 'origin', pin, cwd=sln_dir)
for ref in refs:
refspec = '%s:%s' % (ref, ref_to_remote_ref(ref.lstrip('+')))
git('fetch', 'origin', refspec, cwd=sln_dir)
# Windows sometimes has trouble deleting files.
# This can make git commands that rely on locks fail.
# Try a few times in case Windows has trouble again (and again).
if sys.platform.startswith('win'):
_maybe_break_locks(sln_dir, tries=3)
# Note that the '--' argument is needed to ensure that git treats
# 'pin or branch' as revision or ref, and not as file/directory which
# happens to have the exact same name.
git('checkout', '--force', pin or branch, '--', cwd=sln_dir)
git('clean', '-dff', cwd=sln_dir)
return
except SubprocessFailed as e:
# Exited abnormally, there's probably something wrong.
print('Something failed: %s.' % str(e))
bot_update: optimize checkout of solution's main repo. Goal: reduce number of git fetches from remote to the minimum possible. Minimum possible is either: * 0 if desired revision is pinned (!= HEAD) and already exists in cache * 1 if desired revision is HEAD * >= 2 if revision is pinned but we talk temporarily out-of-date git server not yet having it. This CL achieves the above. No fetch: https://ci.chromium.org/swarming/task/39dad20230c84110?server=chromium-swarm.appspot.com bot_update takes <1min, but it used to take at least 2. The steps are now like this: ... ===Running git cat-file -e 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== In directory: /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running /b/swarming/w/ir/cipd_bin_packages/bin/python -u /b/swarming/w/ir/recipe-checkout-dir/depot_tools/git_cache.py exists --quiet --cache-dir /b/swarming/w/ir/cache/git https://chromium.googlesource.com/chromium/src.git=== In directory: /b/swarming/w/ir/cache/builder/linux /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src ===Succeeded in 0.0 mins=== ===Running git remote set-url origin /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src=== In directory: /b/swarming/w/ir/cache/builder/linux/src ===Succeeded in 0.0 mins=== ===Running git fetch origin=== In directory: /b/swarming/w/ir/cache/builder/linux/src From /b/swarming/w/ir/cache/git/chromium.googlesource.com-chromium-src 003eedbfee47..5210107a20e8 master -> origin/master ===Succeeded in 0.0 mins=== ===Running git checkout --force 33bf8a94dcd5e0abbdf83e4afaed24b5180e3eb2=== ... Fetch & success: https://ci.chromium.org/swarming/task/39db022b874ffd10?server=chromium-swarm.appspot.com Fetch & retry because missing rev: https://ci.chromium.org/swarming/task/39db04ce8b4b8910?server=chromium-swarm.appspot.com Fetch because rev=HEAD: https://ci.chromium.org/swarming/task/39db0c0dd5ab5d10?server=chromium-swarm.appspot.com This has already been adopted in gclient. Bug: Change-Id: Id99892b62719fdf3f7e6e59058986d1500384f8d Reviewed-on: https://chromium-review.googlesource.com/771591 Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org> Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
8 years ago
if first_try:
first_try = False
# Lets wipe the checkout and try again.
remove(sln_dir, cleanup_dir)
else:
raise
def _git_disable_gc(cwd):
git('config', 'gc.auto', '0', cwd=cwd)
git('config', 'gc.autodetach', '0', cwd=cwd)
git('config', 'gc.autopacklimit', '0', cwd=cwd)
def _set_remote_head(cwd):
if len(git('ls-remote', 'origin', 'HEAD', cwd=cwd)) > 0:
return
try:
git('remote', 'set-head', 'origin', '--auto', cwd=cwd)
except SubprocessFailed:
# If remote HEAD cannot be set automatically, prefer main over master.
try:
git('remote', 'set-head', 'origin', 'main', cwd=cwd)
except SubprocessFailed:
git('remote', 'set-head', 'origin', 'master', cwd=cwd)
def get_commit_position(git_path, revision='HEAD'):
"""Dumps the 'git' log for a specific revision and parses out the commit
position.
If a commit position metadata key is found, its value will be returned.
"""
# TODO(iannucci): Use git-footers for this.
git_log = git('log', '--format=%B', '-n1', revision, cwd=git_path)
footer_map = get_commit_message_footer_map(git_log)
# Search for commit position metadata
value = (footer_map.get(COMMIT_POSITION_FOOTER_KEY) or
footer_map.get(COMMIT_ORIGINAL_POSITION_FOOTER_KEY))
if value:
return value
return None
def parse_got_revision(manifest, got_revision_mapping):
"""Translate git gclient revision mapping to build properties."""
properties = {}
manifest = {
# Make sure path always ends with a single slash.
'%s/' % path.rstrip('/'): info
for path, info in manifest.items()
}
for property_name, dir_name in got_revision_mapping.items():
# Make sure dir_name always ends with a single slash.
dir_name = '%s/' % dir_name.rstrip('/')
if dir_name not in manifest:
continue
info = manifest[dir_name]
revision = git('rev-parse', 'HEAD', cwd=dir_name).strip()
commit_position = get_commit_position(dir_name)
properties[property_name] = revision
if commit_position:
properties['%s_cp' % property_name] = commit_position
return properties
def emit_json(out_file, did_run, **kwargs):
"""Write run information into a JSON file."""
output = {}
output.update({'did_run': did_run})
output.update(kwargs)
with open(out_file, 'wb') as f:
f.write(json.dumps(output, sort_keys=True))
@_set_git_config
def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
Allow the bot_update api to not fetch tags from the git server. There are 3 layers modified, starting from the bottom up: 1. git_cache.py populate Now takes a --no-fetch-tags option. If specified, the cache will not fetch updated tags from the server by passing --no-tags to git fetch. This prevents the server from sending all the tag refs. In chromium this prevents significant time bottlenecks dealing with 10k+ tags. 2. bot_update.py bot_update has to deal with multiple git repos, it has the root repo that is checked out through git-cache, as well as repos synched via DEPS and gclient. The script now takes a --no_fetch_tags option. If specified, the git-cache populate call will include --no-fetch-tags. Otherwise, it won't. So this controls (for chromium) if fetches to the src.git server are passed --no-tags. 3. bot_update/api.py This is the entry point for recipes and also has to deal with multiple git repos. The behaviour at this point is not changed from the default. A |no_fetch_tags| parameter is added to ensure_checkout() that defaults to False. This CL is a refactor with no intended behavior change. The next step will be to change the chromium build repo to pass True for ensure_checkout(no_fetch_tags) on chromium trybots. This represents solution #2 in https://docs.google.com/document/d/1hDIunJjjfpmr50y3YnZ4o3aq1NZF4gJa1TS0p7AIL64/edit# Bug: 1019824 Change-Id: I935430603299daa9e301a95a5184c0ce486fd912 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1894352 Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Auto-Submit: danakj <danakj@chromium.org>
6 years ago
target_cpu, patch_root, patch_refs, gerrit_rebase_patch_ref,
no_fetch_tags, refs, git_cache_dir, cleanup_dir,
gerrit_reset, enforce_fetch):
# Get a checkout of each solution, without DEPS or hooks.
# Calling git directly because there is no way to run Gclient without
# invoking DEPS.
print('Fetching Git checkout')
Allow the bot_update api to not fetch tags from the git server. There are 3 layers modified, starting from the bottom up: 1. git_cache.py populate Now takes a --no-fetch-tags option. If specified, the cache will not fetch updated tags from the server by passing --no-tags to git fetch. This prevents the server from sending all the tag refs. In chromium this prevents significant time bottlenecks dealing with 10k+ tags. 2. bot_update.py bot_update has to deal with multiple git repos, it has the root repo that is checked out through git-cache, as well as repos synched via DEPS and gclient. The script now takes a --no_fetch_tags option. If specified, the git-cache populate call will include --no-fetch-tags. Otherwise, it won't. So this controls (for chromium) if fetches to the src.git server are passed --no-tags. 3. bot_update/api.py This is the entry point for recipes and also has to deal with multiple git repos. The behaviour at this point is not changed from the default. A |no_fetch_tags| parameter is added to ensure_checkout() that defaults to False. This CL is a refactor with no intended behavior change. The next step will be to change the chromium build repo to pass True for ensure_checkout(no_fetch_tags) on chromium trybots. This represents solution #2 in https://docs.google.com/document/d/1hDIunJjjfpmr50y3YnZ4o3aq1NZF4gJa1TS0p7AIL64/edit# Bug: 1019824 Change-Id: I935430603299daa9e301a95a5184c0ce486fd912 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1894352 Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Auto-Submit: danakj <danakj@chromium.org>
6 years ago
git_checkouts(solutions, revisions, refs, no_fetch_tags, git_cache_dir,
Reland "Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache"" This is a reland of 3774c589cb395e9949f5e7d92f837e4a424617d8 Added missing options.enforce_fetch arg Confirmed via a fake test roll with this CL's patch commit that the bot_update step passes with this change: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2443649 Original change's description: > Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache" > > This is a reland of f38f54f2f1a3121643d86abab9e6ebe597238d9b > > Original change's description: > > Add optional enforce_fetch kwarg to fetch and refresh git cache > > > > Allows builders to do a force refresh of the git cache to ensure a new > > fetch happens. android-binary-size needs this to get an accurate diff > > of the passed in src revision and the applied patch: > > https://bugs.chromium.org/p/chromium/issues/detail?id=1129235#c19 > > > > Bug: 1129235 > > Change-Id: I993521cdde2a491fc9d42d75ff28dedcd2cea64e > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2438802 > > Commit-Queue: Stephanie Kim <kimstephanie@google.com> > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Bug: 1129235 > Change-Id: I034a91a8b57821d08b10042f7fc94d32350540ba > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443235 > Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org> > Commit-Queue: Stephanie Kim <kimstephanie@google.com> Bug: 1129235 Change-Id: Ibbd4535f8529243d2dc1d4d32881d8a61efe374a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443574 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Stephanie Kim <kimstephanie@google.com>
5 years ago
cleanup_dir, enforce_fetch)
# Ensure our build/ directory is set up with the correct .gclient file.
gclient_configure(solutions, target_os, target_os_only, target_cpu,
git_cache_dir)
# We want to pass all non-solution revisions into the gclient sync call.
solution_dirs = {sln['name'] for sln in solutions}
gc_revisions = {
dirname: rev for dirname, rev in revisions.items()
if dirname not in solution_dirs}
# Gclient sometimes ignores "unmanaged": "False" in the gclient solution
# if --revision <anything> is passed (for example, for subrepos).
# This forces gclient to always treat solutions deps as unmanaged.
for solution_name in list(solution_dirs):
gc_revisions[solution_name] = 'unmanaged'
# Let gclient do the DEPS syncing.
# The branch-head refspec is a special case because it's possible Chrome
# src, which contains the branch-head refspecs, is DEPSed in.
gclient_sync(
BRANCH_HEADS_REFSPEC in refs,
TAGS_REFSPEC in refs,
gc_revisions,
patch_refs,
gerrit_reset,
gerrit_rebase_patch_ref)
# Now that gclient_sync has finished, we should revert any .DEPS.git so that
# presubmit doesn't complain about it being modified.
if git('ls-files', '.DEPS.git', cwd=first_sln).strip():
git('checkout', 'HEAD', '--', '.DEPS.git', cwd=first_sln)
# Reset the deps_file point in the solutions so that hooks get run properly.
for sln in solutions:
sln['deps_file'] = sln.get('deps_file', 'DEPS').replace('.DEPS.git', 'DEPS')
gclient_configure(solutions, target_os, target_os_only, target_cpu,
git_cache_dir)
def parse_revisions(revisions, root):
"""Turn a list of revision specs into a nice dictionary.
We will always return a dict with {root: something}. By default if root
is unspecified, or if revisions is [], then revision will be assigned 'HEAD'
"""
results = {root.strip('/'): 'HEAD'}
expanded_revisions = []
for revision in revisions:
# Allow rev1,rev2,rev3 format.
# TODO(hinoka): Delete this when webkit switches to recipes.
expanded_revisions.extend(revision.split(','))
for revision in expanded_revisions:
split_revision = revision.split('@', 1)
if len(split_revision) == 1:
# This is just a plain revision, set it as the revision for root.
results[root] = split_revision[0]
else:
# This is an alt_root@revision argument.
current_root, current_rev = split_revision
parsed_root = urlparse.urlparse(current_root)
if parsed_root.scheme in ['http', 'https']:
# We want to normalize git urls into .git urls.
normalized_root = 'https://' + parsed_root.netloc + parsed_root.path
if not normalized_root.endswith('.git'):
normalized_root += '.git'
elif parsed_root.scheme:
print('WARNING: Unrecognized scheme %s, ignoring' % parsed_root.scheme)
continue
else:
# This is probably a local path.
normalized_root = current_root.strip('/')
results[normalized_root] = current_rev
return results
def parse_args():
parse = optparse.OptionParser()
parse.add_option('--root', dest='patch_root',
help='DEPRECATED: Use --patch_root.')
parse.add_option('--patch_root', help='Directory to patch on top of.')
parse.add_option('--patch_ref', dest='patch_refs', action='append', default=[],
help='Git repository & ref to apply, as REPO@REF.')
parse.add_option('--gerrit_no_rebase_patch_ref', action='store_true',
help='Bypass rebase of Gerrit patch ref after checkout.')
parse.add_option('--gerrit_no_reset', action='store_true',
help='Bypass calling reset after applying a gerrit ref.')
parse.add_option('--specs', help='Gcilent spec.')
parse.add_option('--spec-path', help='Path to a Gcilent spec file.')
parse.add_option('--revision_mapping_file',
help=('Path to a json file of the form '
'{"property_name": "path/to/repo/"}'))
parse.add_option('--revision', action='append', default=[],
help='Revision to check out. Can be any form of git ref. '
'Can prepend root@<rev> to specify which repository, '
'where root is either a filesystem path or git https '
'url. To specify Tip of Tree, set rev to HEAD. ')
Allow the bot_update api to not fetch tags from the git server. There are 3 layers modified, starting from the bottom up: 1. git_cache.py populate Now takes a --no-fetch-tags option. If specified, the cache will not fetch updated tags from the server by passing --no-tags to git fetch. This prevents the server from sending all the tag refs. In chromium this prevents significant time bottlenecks dealing with 10k+ tags. 2. bot_update.py bot_update has to deal with multiple git repos, it has the root repo that is checked out through git-cache, as well as repos synched via DEPS and gclient. The script now takes a --no_fetch_tags option. If specified, the git-cache populate call will include --no-fetch-tags. Otherwise, it won't. So this controls (for chromium) if fetches to the src.git server are passed --no-tags. 3. bot_update/api.py This is the entry point for recipes and also has to deal with multiple git repos. The behaviour at this point is not changed from the default. A |no_fetch_tags| parameter is added to ensure_checkout() that defaults to False. This CL is a refactor with no intended behavior change. The next step will be to change the chromium build repo to pass True for ensure_checkout(no_fetch_tags) on chromium trybots. This represents solution #2 in https://docs.google.com/document/d/1hDIunJjjfpmr50y3YnZ4o3aq1NZF4gJa1TS0p7AIL64/edit# Bug: 1019824 Change-Id: I935430603299daa9e301a95a5184c0ce486fd912 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1894352 Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Auto-Submit: danakj <danakj@chromium.org>
6 years ago
parse.add_option(
'--no_fetch_tags',
action='store_true',
help=('Don\'t fetch tags from the server for the git checkout. '
'This can speed up fetch considerably when '
'there are many tags.'))
Reland "Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache"" This is a reland of 3774c589cb395e9949f5e7d92f837e4a424617d8 Added missing options.enforce_fetch arg Confirmed via a fake test roll with this CL's patch commit that the bot_update step passes with this change: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2443649 Original change's description: > Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache" > > This is a reland of f38f54f2f1a3121643d86abab9e6ebe597238d9b > > Original change's description: > > Add optional enforce_fetch kwarg to fetch and refresh git cache > > > > Allows builders to do a force refresh of the git cache to ensure a new > > fetch happens. android-binary-size needs this to get an accurate diff > > of the passed in src revision and the applied patch: > > https://bugs.chromium.org/p/chromium/issues/detail?id=1129235#c19 > > > > Bug: 1129235 > > Change-Id: I993521cdde2a491fc9d42d75ff28dedcd2cea64e > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2438802 > > Commit-Queue: Stephanie Kim <kimstephanie@google.com> > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Bug: 1129235 > Change-Id: I034a91a8b57821d08b10042f7fc94d32350540ba > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443235 > Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org> > Commit-Queue: Stephanie Kim <kimstephanie@google.com> Bug: 1129235 Change-Id: Ibbd4535f8529243d2dc1d4d32881d8a61efe374a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443574 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Stephanie Kim <kimstephanie@google.com>
5 years ago
parse.add_option(
'--enforce_fetch',
action='store_true',
Reland "Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache"" This is a reland of 3774c589cb395e9949f5e7d92f837e4a424617d8 Added missing options.enforce_fetch arg Confirmed via a fake test roll with this CL's patch commit that the bot_update step passes with this change: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2443649 Original change's description: > Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache" > > This is a reland of f38f54f2f1a3121643d86abab9e6ebe597238d9b > > Original change's description: > > Add optional enforce_fetch kwarg to fetch and refresh git cache > > > > Allows builders to do a force refresh of the git cache to ensure a new > > fetch happens. android-binary-size needs this to get an accurate diff > > of the passed in src revision and the applied patch: > > https://bugs.chromium.org/p/chromium/issues/detail?id=1129235#c19 > > > > Bug: 1129235 > > Change-Id: I993521cdde2a491fc9d42d75ff28dedcd2cea64e > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2438802 > > Commit-Queue: Stephanie Kim <kimstephanie@google.com> > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Bug: 1129235 > Change-Id: I034a91a8b57821d08b10042f7fc94d32350540ba > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443235 > Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org> > Commit-Queue: Stephanie Kim <kimstephanie@google.com> Bug: 1129235 Change-Id: Ibbd4535f8529243d2dc1d4d32881d8a61efe374a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443574 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Stephanie Kim <kimstephanie@google.com>
5 years ago
help=('Enforce a new fetch to refresh the git cache, even if the '
'solution revision passed in already exists in the current '
'git cache.'))
Reland "Remove obsolete bot_update flag" This reverts commit c91686c087704f3aeea594e6b7c82767fa7d753b. Reason for revert: Reland a light version of the original CL that keeps a dummy flag around. Original change's description: > Revert "Remove obsolete bot_update flag" > > This reverts commit 72048266d5cf68dc06c2cd20e173fbcb6f0dcfd2. > > Reason for revert: Skia depends on it. Need to clean that up first. Currently blocks roll: > https://skia-review.googlesource.com/c/14145/ > > Original change's description: > > Remove obsolete bot_update flag > > > > Using the manifest is the default since a long time. The flag was only introduced to smoothly switch it on. Now the flag is not needed anymore. > > > > Bug: 398105 > > Change-Id: I4eb1c98e26e025a69f8b0a7c48877d78c031702e > > Reviewed-on: https://chromium-review.googlesource.com/485659 > > Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org> > > Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org> > > Commit-Queue: Michael Achenbach <machenbach@chromium.org> > > > > TBR=phajdan.jr@chromium.org,machenbach@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,chromium-reviews@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: Iffc4d8076abd3c92feebfd7f3ef88be7ce34b692 > Reviewed-on: https://chromium-review.googlesource.com/486639 > Reviewed-by: Michael Achenbach <machenbach@chromium.org> > Commit-Queue: Michael Achenbach <machenbach@chromium.org> > R=phajdan.jr@chromium.org,machenbach@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,chromium-reviews@chromium.org Bug: 398105 Change-Id: I817d446f8a8eff84c5d7143ac2b9c527a40991f1 Reviewed-on: https://chromium-review.googlesource.com/486640 Commit-Queue: Michael Achenbach <machenbach@chromium.org> Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org>
8 years ago
# TODO(machenbach): Remove the flag when all uses have been removed.
parse.add_option('--output_manifest', action='store_true',
Reland "Remove obsolete bot_update flag" This reverts commit c91686c087704f3aeea594e6b7c82767fa7d753b. Reason for revert: Reland a light version of the original CL that keeps a dummy flag around. Original change's description: > Revert "Remove obsolete bot_update flag" > > This reverts commit 72048266d5cf68dc06c2cd20e173fbcb6f0dcfd2. > > Reason for revert: Skia depends on it. Need to clean that up first. Currently blocks roll: > https://skia-review.googlesource.com/c/14145/ > > Original change's description: > > Remove obsolete bot_update flag > > > > Using the manifest is the default since a long time. The flag was only introduced to smoothly switch it on. Now the flag is not needed anymore. > > > > Bug: 398105 > > Change-Id: I4eb1c98e26e025a69f8b0a7c48877d78c031702e > > Reviewed-on: https://chromium-review.googlesource.com/485659 > > Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org> > > Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org> > > Commit-Queue: Michael Achenbach <machenbach@chromium.org> > > > > TBR=phajdan.jr@chromium.org,machenbach@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,chromium-reviews@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: Iffc4d8076abd3c92feebfd7f3ef88be7ce34b692 > Reviewed-on: https://chromium-review.googlesource.com/486639 > Reviewed-by: Michael Achenbach <machenbach@chromium.org> > Commit-Queue: Michael Achenbach <machenbach@chromium.org> > R=phajdan.jr@chromium.org,machenbach@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,chromium-reviews@chromium.org Bug: 398105 Change-Id: I817d446f8a8eff84c5d7143ac2b9c527a40991f1 Reviewed-on: https://chromium-review.googlesource.com/486640 Commit-Queue: Michael Achenbach <machenbach@chromium.org> Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org>
8 years ago
help=('Deprecated.'))
parse.add_option('--clobber', action='store_true',
help='Delete checkout first, always')
parse.add_option('--output_json',
help='Output JSON information into a specified file')
parse.add_option('--refs', action='append',
help='Also fetch this refspec for the main solution(s). '
'Eg. +refs/branch-heads/*')
parse.add_option('--with_branch_heads', action='store_true',
help='Always pass --with_branch_heads to gclient. This '
'does the same thing as --refs +refs/branch-heads/*')
parse.add_option('--with_tags', action='store_true',
help='Always pass --with_tags to gclient. This '
'does the same thing as --refs +refs/tags/*')
parse.add_option('--git-cache-dir', help='Path to git cache directory.')
parse.add_option('--cleanup-dir',
help='Path to a cleanup directory that can be used for '
'deferred file cleanup.')
options, args = parse.parse_args()
if options.spec_path:
if options.specs:
parse.error('At most one of --spec-path and --specs may be specified.')
with open(options.spec_path, 'r') as fd:
options.specs = fd.read()
if not options.output_json:
parse.error('--output_json is required')
if not options.git_cache_dir:
parse.error('--git-cache-dir is required')
if not options.refs:
options.refs = []
if options.with_branch_heads:
options.refs.append(BRANCH_HEADS_REFSPEC)
del options.with_branch_heads
if options.with_tags:
options.refs.append(TAGS_REFSPEC)
del options.with_tags
try:
if not options.revision_mapping_file:
parse.error('--revision_mapping_file is required')
with open(options.revision_mapping_file, 'r') as f:
options.revision_mapping = json.load(f)
except Exception as e:
print(
'WARNING: Caught exception while parsing revision_mapping*: %s'
% (str(e),))
# Because we print CACHE_DIR out into a .gclient file, and then later run
# eval() on it, backslashes need to be escaped, otherwise "E:\b\build" gets
# parsed as "E:[\x08][\x08]uild".
if sys.platform.startswith('win'):
options.git_cache_dir = options.git_cache_dir.replace('\\', '\\\\')
return options, args
def prepare(options, git_slns, active):
"""Prepares the target folder before we checkout."""
dir_names = [sln.get('name') for sln in git_slns if 'name' in sln]
if options.clobber:
ensure_no_checkout(dir_names, options.cleanup_dir)
# Make sure we tell recipes that we didn't run if the script exits here.
emit_json(options.output_json, did_run=active)
total_disk_space, free_disk_space = get_total_disk_space()
total_disk_space_gb = int(total_disk_space / (1024 * 1024 * 1024))
used_disk_space_gb = int((total_disk_space - free_disk_space)
/ (1024 * 1024 * 1024))
percent_used = int(used_disk_space_gb * 100 / total_disk_space_gb)
step_text = '[%dGB/%dGB used (%d%%)]' % (used_disk_space_gb,
total_disk_space_gb,
percent_used)
# The first solution is where the primary DEPS file resides.
first_sln = dir_names[0]
# Split all the revision specifications into a nice dict.
print('Revisions: %s' % options.revision)
revisions = parse_revisions(options.revision, first_sln)
print('Fetching Git checkout at %s@%s' % (first_sln, revisions[first_sln]))
return revisions, step_text
def checkout(options, git_slns, specs, revisions, step_text):
print('Using Python version: %s' % (sys.version,))
print('Checking git version...')
ver = git('version').strip()
print('Using %s' % ver)
try:
protocol = git('config', '--get', 'protocol.version')
print('Using git protocol version %s' % protocol)
except SubprocessFailed as e:
print('git protocol version is not specified.')
first_sln = git_slns[0]['name']
dir_names = [sln.get('name') for sln in git_slns if 'name' in sln]
dirty_path = '.dirty_bot_checkout'
if os.path.exists(dirty_path):
ensure_no_checkout(dir_names, options.cleanup_dir)
with open(dirty_path, 'w') as f:
# create file, no content
pass
should_delete_dirty_file = False
try:
# Outer try is for catching patch failures and exiting gracefully.
# Inner try is for catching gclient failures and retrying gracefully.
try:
checkout_parameters = dict(
# First, pass in the base of what we want to check out.
solutions=git_slns,
revisions=revisions,
first_sln=first_sln,
# Also, target os variables for gclient.
target_os=specs.get('target_os', []),
target_os_only=specs.get('target_os_only', False),
# Also, target cpu variables for gclient.
target_cpu=specs.get('target_cpu', []),
# Then, pass in information about how to patch.
patch_root=options.patch_root,
patch_refs=options.patch_refs,
gerrit_rebase_patch_ref=not options.gerrit_no_rebase_patch_ref,
Allow the bot_update api to not fetch tags from the git server. There are 3 layers modified, starting from the bottom up: 1. git_cache.py populate Now takes a --no-fetch-tags option. If specified, the cache will not fetch updated tags from the server by passing --no-tags to git fetch. This prevents the server from sending all the tag refs. In chromium this prevents significant time bottlenecks dealing with 10k+ tags. 2. bot_update.py bot_update has to deal with multiple git repos, it has the root repo that is checked out through git-cache, as well as repos synched via DEPS and gclient. The script now takes a --no_fetch_tags option. If specified, the git-cache populate call will include --no-fetch-tags. Otherwise, it won't. So this controls (for chromium) if fetches to the src.git server are passed --no-tags. 3. bot_update/api.py This is the entry point for recipes and also has to deal with multiple git repos. The behaviour at this point is not changed from the default. A |no_fetch_tags| parameter is added to ensure_checkout() that defaults to False. This CL is a refactor with no intended behavior change. The next step will be to change the chromium build repo to pass True for ensure_checkout(no_fetch_tags) on chromium trybots. This represents solution #2 in https://docs.google.com/document/d/1hDIunJjjfpmr50y3YnZ4o3aq1NZF4gJa1TS0p7AIL64/edit# Bug: 1019824 Change-Id: I935430603299daa9e301a95a5184c0ce486fd912 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1894352 Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Auto-Submit: danakj <danakj@chromium.org>
6 years ago
# Control how the fetch step will occur.
no_fetch_tags=options.no_fetch_tags,
Reland "Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache"" This is a reland of 3774c589cb395e9949f5e7d92f837e4a424617d8 Added missing options.enforce_fetch arg Confirmed via a fake test roll with this CL's patch commit that the bot_update step passes with this change: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2443649 Original change's description: > Reland "Add optional enforce_fetch kwarg to fetch and refresh git cache" > > This is a reland of f38f54f2f1a3121643d86abab9e6ebe597238d9b > > Original change's description: > > Add optional enforce_fetch kwarg to fetch and refresh git cache > > > > Allows builders to do a force refresh of the git cache to ensure a new > > fetch happens. android-binary-size needs this to get an accurate diff > > of the passed in src revision and the applied patch: > > https://bugs.chromium.org/p/chromium/issues/detail?id=1129235#c19 > > > > Bug: 1129235 > > Change-Id: I993521cdde2a491fc9d42d75ff28dedcd2cea64e > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2438802 > > Commit-Queue: Stephanie Kim <kimstephanie@google.com> > > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > > Bug: 1129235 > Change-Id: I034a91a8b57821d08b10042f7fc94d32350540ba > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443235 > Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org> > Commit-Queue: Stephanie Kim <kimstephanie@google.com> Bug: 1129235 Change-Id: Ibbd4535f8529243d2dc1d4d32881d8a61efe374a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443574 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Stephanie Kim <kimstephanie@google.com>
5 years ago
enforce_fetch=options.enforce_fetch,
Allow the bot_update api to not fetch tags from the git server. There are 3 layers modified, starting from the bottom up: 1. git_cache.py populate Now takes a --no-fetch-tags option. If specified, the cache will not fetch updated tags from the server by passing --no-tags to git fetch. This prevents the server from sending all the tag refs. In chromium this prevents significant time bottlenecks dealing with 10k+ tags. 2. bot_update.py bot_update has to deal with multiple git repos, it has the root repo that is checked out through git-cache, as well as repos synched via DEPS and gclient. The script now takes a --no_fetch_tags option. If specified, the git-cache populate call will include --no-fetch-tags. Otherwise, it won't. So this controls (for chromium) if fetches to the src.git server are passed --no-tags. 3. bot_update/api.py This is the entry point for recipes and also has to deal with multiple git repos. The behaviour at this point is not changed from the default. A |no_fetch_tags| parameter is added to ensure_checkout() that defaults to False. This CL is a refactor with no intended behavior change. The next step will be to change the chromium build repo to pass True for ensure_checkout(no_fetch_tags) on chromium trybots. This represents solution #2 in https://docs.google.com/document/d/1hDIunJjjfpmr50y3YnZ4o3aq1NZF4gJa1TS0p7AIL64/edit# Bug: 1019824 Change-Id: I935430603299daa9e301a95a5184c0ce486fd912 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1894352 Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Erik Chen <erikchen@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Auto-Submit: danakj <danakj@chromium.org>
6 years ago
# Finally, extra configurations cleanup dir location.
refs=options.refs,
git_cache_dir=options.git_cache_dir,
cleanup_dir=options.cleanup_dir,
gerrit_reset=not options.gerrit_no_reset)
ensure_checkout(**checkout_parameters)
should_delete_dirty_file = True
except GclientSyncFailed:
print('We failed gclient sync, lets delete the checkout and retry.')
ensure_no_checkout(dir_names, options.cleanup_dir)
ensure_checkout(**checkout_parameters)
should_delete_dirty_file = True
except PatchFailed as e:
# Tell recipes information such as root, got_revision, etc.
emit_json(options.output_json,
did_run=True,
root=first_sln,
patch_apply_return_code=e.code,
patch_root=options.patch_root,
patch_failure=True,
failed_patch_body=e.output,
step_text='%s PATCH FAILED' % step_text,
fixed_revisions=revisions)
should_delete_dirty_file = True
raise
finally:
if should_delete_dirty_file:
try:
os.remove(dirty_path)
except OSError:
print('Dirty file %s has been removed by a different process.' %
dirty_path)
# Take care of got_revisions outputs.
revision_mapping = GOT_REVISION_MAPPINGS.get(git_slns[0]['url'], {})
if options.revision_mapping:
revision_mapping.update(options.revision_mapping)
# If the repo is not in the default GOT_REVISION_MAPPINGS and no
# revision_mapping were specified on the command line then
# default to setting 'got_revision' based on the first solution.
if not revision_mapping:
revision_mapping['got_revision'] = first_sln
manifest = create_manifest()
got_revisions = parse_got_revision(manifest, revision_mapping)
if not got_revisions:
# TODO(hinoka): We should probably bail out here, but in the interest
# of giving mis-configured bots some time to get fixed use a dummy
# revision here.
got_revisions = { 'got_revision': 'BOT_UPDATE_NO_REV_FOUND' }
#raise Exception('No got_revision(s) found in gclient output')
# Tell recipes information such as root, got_revision, etc.
emit_json(options.output_json,
did_run=True,
root=first_sln,
patch_root=options.patch_root,
step_text=step_text,
fixed_revisions=revisions,
properties=got_revisions,
manifest=manifest)
def print_debug_info():
print("Debugging info:")
debug_params = {
'CURRENT_DIR': path.abspath(os.getcwd()),
'THIS_DIR': THIS_DIR,
'DEPOT_TOOLS_DIR': DEPOT_TOOLS_DIR,
}
for k, v in sorted(debug_params.items()):
print("%s: %r" % (k, v))
def main():
# Get inputs.
options, _ = parse_args()
# Check if this script should activate or not.
active = True
# Print a helpful message to tell developers what's going on with this step.
print_debug_info()
# Parse, manipulate, and print the gclient solutions.
specs = {}
exec(options.specs, specs)
orig_solutions = specs.get('solutions', [])
git_slns = modify_solutions(orig_solutions)
solutions_printer(git_slns)
try:
# Dun dun dun, the main part of bot_update.
# gn creates hardlinks during the build. By default, this makes
# `git reset` overwrite the sources of the hardlinks, which causes
# unnecessary rebuilds. (See crbug.com/330461#c13 for an explanation.)
with git_config_if_not_set('core.trustctime', 'false'):
revisions, step_text = prepare(options, git_slns, active)
checkout(options, git_slns, specs, revisions, step_text)
except PatchFailed as e:
# Return a specific non-zero exit code for patch failure (because it is
# a failure), but make it different than other failures to distinguish
# between infra failures (independent from patch author), and patch
# failures (that patch author can fix). However, PatchFailure due to
# download patch failure is still an infra problem.
if e.code == 3:
# Patch download problem.
return 87
# Genuine patch problem.
return 88
if __name__ == '__main__':
sys.exit(main())