libv8 6.7.288.46.1 → 7.3.492.27.0beta1

data/vendor/depot_tools/recipes/recipe_modules/bot_update/OWNERS

@@ -0,0 +1,2 @@
+tandrii@chromium.org
+ehmaldonado@chromium.org

data/vendor/depot_tools/recipes/recipe_modules/bot_update/__init__.py

@@ -2,6 +2,8 @@ DEPS = [
   'depot_tools',
   'gclient',
   'gerrit',
+  'gitiles',
+  'recipe_engine/buildbucket',
   'recipe_engine/context',
   'recipe_engine/json',
   'recipe_engine/path',
@@ -20,24 +22,8 @@ from recipe_engine.config import ConfigGroup, Single
 
 PROPERTIES = {
   # Gerrit patches will have all properties about them prefixed with patch_.
-  'patch_issue': Property(default=None),  # TODO(tandrii): add kind=int.
-  'patch_set': Property(default=None),  # TODO(tandrii): add kind=int.
-  'patch_gerrit_url': Property(default=None),
-  'patch_repository_url': Property(default=None),
-  'patch_ref': Property(default=None),
-
-  # TODO(tAndrii): remove legacy Gerrit fields.
-  # Legacy Gerrit fields.
-  'event.patchSet.ref': Property(default=None, param_name='gerrit_ref'),
-
-  # Rietveld-only (?) fields.
-  'repository': Property(default=None),
-
-  # Common fields for both systems.
   'deps_revision_overrides': Property(default={}),
   'fail_patch': Property(default=None, kind=str),
-  'parent_got_revision': Property(default=None),
-  'revision': Property(default=None),
 
   '$depot_tools/bot_update': Property(
       help='Properties specific to bot_update module.',

data/vendor/depot_tools/recipes/recipe_modules/bot_update/api.py

@@ -6,28 +6,24 @@
 
 from recipe_engine import recipe_api
 
+from PB.go.chromium.org.luci.buildbucket.proto import common as common_pb2
+
 
 class BotUpdateApi(recipe_api.RecipeApi):
 
-  def __init__(self, properties, patch_issue, patch_set,
-               repository, patch_repository_url, gerrit_ref, patch_ref,
-               patch_gerrit_url, revision, parent_got_revision,
-               deps_revision_overrides, fail_patch, *args, **kwargs):
-    self._apply_patch_on_gclient = properties.get(
-        'apply_patch_on_gclient', True)
-    self._issue = patch_issue
-    self._patchset = patch_set
-    self._repository = repository or patch_repository_url
-    self._gerrit_ref = gerrit_ref or patch_ref
-    self._gerrit = patch_gerrit_url
-    self._revision = revision
-    self._parent_got_revision = parent_got_revision
+  def __init__(self, properties, deps_revision_overrides, fail_patch, *args,
+               **kwargs):
     self._deps_revision_overrides = deps_revision_overrides
     self._fail_patch = fail_patch
 
     self._last_returned_properties = {}
     super(BotUpdateApi, self).__init__(*args, **kwargs)
 
+  def initialize(self):
+    assert len(self.m.buildbucket.build.input.gerrit_changes) <= 1, (
+        'bot_update does not support more than one '
+        'buildbucket.build.input.gerrit_changes')
+
   def __call__(self, name, cmd, **kwargs):
     """Wrapper for easy calling of bot_update."""
     assert isinstance(cmd, (list, tuple))
@@ -41,33 +37,37 @@ class BotUpdateApi(recipe_api.RecipeApi):
   def last_returned_properties(self):
       return self._last_returned_properties
 
-  # DO NOT USE.
-  # TODO(tandrii): refactor this into tryserver.maybe_apply_patch
-  def apply_gerrit_ref(self, root, gerrit_no_reset=False,
-                       gerrit_no_rebase_patch_ref=False,
-                       gerrit_repo=None, gerrit_ref=None,
-                       step_name='apply_gerrit', **kwargs):
-    apply_gerrit_path = self.resource('apply_gerrit.py')
-    kwargs.setdefault('infra_step', True)
-    cmd = [
-        '--gerrit_repo', gerrit_repo or self._repository,
-        '--gerrit_ref', gerrit_ref or self._gerrit_ref or '',
-        '--root', str(root),
-    ]
-    if gerrit_no_reset:
-      cmd.append('--gerrit_no_reset')
-    if gerrit_no_rebase_patch_ref:
-      cmd.append('--gerrit_no_rebase_patch_ref')
+  def _get_commit_repo_path(self, commit, gclient_config):
+    """Returns local path to the repo that the commit is associated with.
 
-    env_prefixes = {
-        'PATH': [self.m.depot_tools.root],
-    }
-    with self.m.context(env_prefixes=env_prefixes):
-      return self.m.python(step_name, apply_gerrit_path, cmd, **kwargs)
+    The commit must be a self.m.buildbucket.common_pb2.GitilesCommit.
+    If commit does not specify any repo, returns name of the first solution.
+
+    Raises an InfraFailure if the commit specifies a repo unexpected by gclient.
+    """
+    assert gclient_config.solutions, 'gclient_config.solutions is empty'
+
+    # if repo is not specified, choose the first solution.
+    if not (commit.host and commit.project):
+      return gclient_config.solutions[0].name
+    assert commit.host and commit.project
+
+    repo_url = self.m.gitiles.unparse_repo_url(commit.host, commit.project)
+    repo_path = self.m.gclient.get_repo_path(
+        repo_url, gclient_config=gclient_config)
+    if not repo_path:
+      raise self.m.step.InfraFailure(
+          'invalid (host, project) pair in '
+          'buildbucket.build.input.gitiles_commit: '
+          '(%r, %r) does not match any of configured gclient solutions '
+          'and not present in gclient_config.repo_path_map' % (
+              commit.host, commit.project))
+
+    return repo_path
 
   def ensure_checkout(self, gclient_config=None, suffix=None,
                       patch=True, update_presentation=True,
-                      patch_root=None, no_shallow=True,
+                      patch_root=None,
                       with_branch_heads=False, with_tags=False, refs=None,
                       patch_oauth2=None, oauth2_json=None,
                       use_site_config_creds=None, clobber=False,
@@ -75,6 +75,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
                       patchset=None, gerrit_no_reset=False,
                       gerrit_no_rebase_patch_ref=False,
                       disable_syntax_validation=False, manifest_name=None,
+                      patch_refs=None, ignore_input_commit=False,
+                      set_output_commit=False,
                       **kwargs):
     """
     Args:
@@ -85,6 +87,15 @@ class BotUpdateApi(recipe_api.RecipeApi):
         such as bisect.
       manifest_name: The name of the manifest to upload to LogDog.  This must
         be unique for the whole build.
+      ignore_input_commit: if True, ignore api.buildbucket.gitiles_commit.
+        Exists for historical reasons. Please do not use.
+      set_output_commit: if True, mark the checked out commit as the
+        primary output commit of this build, i.e. call
+        api.buildbucket.set_output_gitiles_commit.
+        In case of multiple repos, the repo is the one specified in
+        api.buildbucket.gitiles_commit or the first configured solution.
+        When sorting builds by commit position, this commit will be used.
+        Requires falsy ignore_input_commit.
     """
     assert use_site_config_creds is None, "use_site_config_creds is deprecated"
     assert rietveld is None, "rietveld is deprecated"
@@ -92,6 +103,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
     assert patchset is None, "patchset is deprecated"
     assert patch_oauth2 is None, "patch_oauth2 is deprecated"
     assert oauth2_json is None, "oauth2_json is deprecated"
+    assert not (ignore_input_commit and set_output_commit)
 
     refs = refs or []
     # We can re-use the gclient spec from the gclient module, since all the
@@ -100,34 +112,15 @@ class BotUpdateApi(recipe_api.RecipeApi):
     assert cfg is not None, (
         'missing gclient_config or forgot api.gclient.set_config(...) before?')
 
-
     # Construct our bot_update command.  This basically be inclusive of
     # everything required for bot_update to know:
-    root = patch_root
-    if root is None:
-      root = self.m.gclient.calculate_patch_root(
-          self.m.properties.get('patch_project'), cfg, self._repository)
-
-    if patch:
-      patchset = patchset or self._patchset
-      gerrit_repo = self._repository
-      gerrit_ref = self._gerrit_ref
-    else:
-      # The trybot recipe sometimes wants to de-apply the patch. In which case
-      # we pretend the issue/patchset never existed.
-      gerrit_repo = gerrit_ref = None
-
-    # The gerrit_ref and gerrit_repo must be together or not at all.  If one is
-    # missing, clear both of them.
-    if not gerrit_ref or not gerrit_repo:
-      gerrit_repo = gerrit_ref = None
-    assert (gerrit_ref != None) == (gerrit_repo != None)
+    patch_root = patch_root or self.m.gclient.get_gerrit_patch_root(
+        gclient_config=cfg)
 
     # Allow patch_project's revision if necessary.
     # This is important for projects which are checked out as DEPS of the
     # gclient solution.
-    self.m.gclient.set_patch_project_revision(
-        self.m.properties.get('patch_project'), cfg)
+    self.m.gclient.set_patch_repo_revision(cfg)
 
     reverse_rev_map = self.m.gclient.got_revision_reverse_mapping(cfg)
 
@@ -135,38 +128,61 @@ class BotUpdateApi(recipe_api.RecipeApi):
         # What do we want to check out (spec/root/rev/reverse_rev_map).
         ['--spec-path', self.m.raw_io.input(
             self.m.gclient.config_to_pythonish(cfg))],
-        ['--patch_root', root],
+        ['--patch_root', patch_root],
         ['--revision_mapping_file', self.m.json.input(reverse_rev_map)],
         ['--git-cache-dir', cfg.cache_dir],
         ['--cleanup-dir', self.m.path['cleanup'].join('bot_update')],
 
-        # How to find the patch, if any
-        ['--gerrit_repo', gerrit_repo],
-        ['--gerrit_ref', gerrit_ref],
-
         # Hookups to JSON output back into recipes.
         ['--output_json', self.m.json.output()],
     ]
 
+    # How to find the patch, if any
+    if patch:
+      repo_url = self.m.tryserver.gerrit_change_repo_url
+      fetch_ref = self.m.tryserver.gerrit_change_fetch_ref
+      if repo_url and fetch_ref:
+        flags.append(['--patch_ref', '%s@%s' % (repo_url, fetch_ref)])
+      if patch_refs:
+        flags.extend(
+            ['--patch_ref', patch_ref]
+            for patch_ref in patch_refs)
+
     # Compute requested revisions.
     revisions = {}
     for solution in cfg.solutions:
       if solution.revision:
         revisions[solution.name] = solution.revision
-      elif solution == cfg.solutions[0]:
-        # TODO(machenbach): We should explicitly pass HEAD for ALL solutions
-        # that don't specify anything else.
-        revisions[solution.name] = (
-            self._parent_got_revision or
-            self._revision or
-            'HEAD')
-    if self.m.gclient.c and self.m.gclient.c.revisions:
+
+    # HACK: ensure_checkout API must be redesigned so that we don't pass such
+    # parameters. Existing semantics is too opiniated.
+    main_repo_path = None
+    input_commit = self.m.buildbucket.gitiles_commit
+    input_commit_rev = input_commit.id or input_commit.ref
+    if not ignore_input_commit:
+      main_repo_path = self._get_commit_repo_path(input_commit, cfg)
+      # Note: this is not entirely correct. build.input.gitiles_commit
+      # definition says "The Gitiles commit to run against.".
+      # However, here we ignore it if the config specified a revision.
+      # This is necessary because existing builders rely on this behavior,
+      # e.g. they want to force refs/heads/master at the config level.
+      if input_commit_rev:
+        revisions[main_repo_path] = (
+            revisions.get(main_repo_path) or input_commit_rev)
+
+    # Guarantee that first solution has a revision.
+    # TODO(machenbach): We should explicitly pass HEAD for ALL solutions
+    # that don't specify anything else.
+    first_sol = cfg.solutions[0].name
+    revisions[first_sol] = revisions.get(first_sol) or 'HEAD'
+
+    if cfg.revisions:
       # Only update with non-empty values. Some recipe might otherwise
       # overwrite the HEAD default with an empty string.
       revisions.update(
-          (k, v) for k, v in self.m.gclient.c.revisions.iteritems() if v)
+          (k, v) for k, v in cfg.revisions.iteritems() if v)
     if cfg.solutions and root_solution_revision:
-      revisions[cfg.solutions[0].name] = root_solution_revision
+      revisions[first_sol] = root_solution_revision
     # Allow for overrides required to bisect into rolls.
     revisions.update(self._deps_revision_overrides)
 
@@ -184,7 +200,12 @@ class BotUpdateApi(recipe_api.RecipeApi):
           fixed_revision = self._destination_branch(cfg, name)
         # If we're syncing to a ref, we want to make sure it exists before
         # trying to check it out.
-        if fixed_revision.startswith('refs/'):
+        if (fixed_revision.startswith('refs/') and
+            # TODO(crbug.com/874501): fetching additional refs is currently
+            # only supported for the root solution. We should investigate
+            # supporting it for other dependencies.
+            cfg.solutions and
+            cfg.solutions[0].name == name):
           # Handle the "ref:revision" syntax, e.g.
           # refs/branch-heads/4.2:deadbeef
           refs.append(fixed_revision.split(':')[0])
@@ -208,8 +229,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
 
     if clobber:
       cmd.append('--clobber')
-    if no_shallow is False:
-      cmd.append('--maybe_shallow')
     if with_branch_heads or cfg.with_branch_heads:
       cmd.append('--with_branch_heads')
     if with_tags or cfg.with_tags:
@@ -220,13 +239,11 @@ class BotUpdateApi(recipe_api.RecipeApi):
       cmd.append('--gerrit_no_rebase_patch_ref')
     if disable_syntax_validation or cfg.disable_syntax_validation:
       cmd.append('--disable-syntax-validation')
-    if not self._apply_patch_on_gclient:
-      cmd.append('--no-apply-patch-on-gclient')
 
     # Inject Json output for testing.
     first_sln = cfg.solutions[0].name
     step_test_data = lambda: self.test_api.output_json(
-        root, first_sln, reverse_rev_map, self._fail_patch,
+        patch_root, first_sln, reverse_rev_map, self._fail_patch,
         fixed_revisions=fixed_revisions)
 
     name = 'bot_update'
@@ -250,27 +267,54 @@ class BotUpdateApi(recipe_api.RecipeApi):
     finally:
       if step_result and step_result.json.output:
         result = step_result.json.output
-        self._last_returned_properties = step_result.json.output.get(
-            'properties', {})
+        self._last_returned_properties = result.get('properties', {})
 
         if update_presentation:
           # Set properties such as got_revision.
           for prop_name, prop_value in (
               self.last_returned_properties.iteritems()):
             step_result.presentation.properties[prop_name] = prop_value
+
         # Add helpful step description in the step UI.
         if 'step_text' in result:
           step_text = result['step_text']
           step_result.presentation.step_text = step_text
 
         # Export the step results as a Source Manifest to LogDog.
+        source_manifest = result.get('source_manifest', {})
         if manifest_name:
           if not patch:
             # The param "patched" is purely cosmetic to mean "if false, this
             # bot_update run exists purely to unpatch an existing patch".
             manifest_name += '_unpatched'
           self.m.source_manifest.set_json_manifest(
-              manifest_name, result.get('source_manifest', {}))
+              manifest_name, source_manifest)
+
+        # Set output commit of the build.
+        git_checkout = (
+            source_manifest
+            .get('directories', {})
+            .get(main_repo_path, {})
+            .get('git_checkout', {}))
+        if set_output_commit and git_checkout:
+          output_commit = common_pb2.GitilesCommit(
+              ref=revisions.get(main_repo_path) or '',
+              id=git_checkout['revision'],
+          )
+          if not output_commit.ref.startswith('refs/'):
+            # Require that what was checked out is what was requested on
+            # input commit.
+            # If this assertion fails, this setup is unusual/unsupported.
+            # The caller should not pass set_output_commit=True and should call
+            # api.buildbucket.set_output_gitiles_commit themselves.
+            assert (
+                input_commit.ref and
+                # Revision was not overridden.
+                revisions[main_repo_path] == input_commit_rev)
+            output_commit.ref = input_commit.ref
+          output_commit.host, output_commit.project = (
+              self.m.gitiles.parse_repo_url(git_checkout['repo_url']))
+          self.m.buildbucket.set_output_gitiles_commit(output_commit)
 
         # Set the "checkout" path for the main solution.
         # This is used by the Chromium module to figure out where to look for
@@ -299,7 +343,9 @@ class BotUpdateApi(recipe_api.RecipeApi):
 
         # bot_update actually just sets root to be the folder name of the
         # first solution.
-        if result['did_run'] and 'checkout' not in self.m.path:
+        if (result.get('did_run')
+            and 'checkout' not in self.m.path
+            and 'root' in result):
           co_root = result['root']
           cwd = self.m.context.cwd or self.m.path['start_dir']
           self.m.path['checkout'] = cwd.join(*co_root.split(self.m.path.sep))
@@ -310,7 +356,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
     """Returns the destination branch of a CL for the matching project
     if available or HEAD otherwise.
 
-    This is a noop if there's no Gerrit CL associated with the run.
+    If there's no Gerrit CL associated with the run, returns 'HEAD'.
     Otherwise this queries Gerrit for the correct destination branch, which
     might differ from master.
 
@@ -323,26 +369,22 @@ class BotUpdateApi(recipe_api.RecipeApi):
         A destination branch as understood by bot_update.py if available
         and if different from master, returns 'HEAD' otherwise.
     """
-    # Bail out if this is not a gerrit issue.
-    if (not self.m.tryserver.is_gerrit_issue or
-        not self._gerrit or not self._issue):
+    # Ignore project paths other than the one belonging to the current CL.
+    patch_path = self.m.gclient.get_gerrit_patch_root(gclient_config=cfg)
+    if not patch_path or path != patch_path:
       return 'HEAD'
 
-    # Ignore other project paths than the one belonging to the CL.
-    if path != cfg.patch_projects.get(
-        self.m.properties.get('patch_project'),
-        (cfg.solutions[0].name, None))[0]:
+    target_ref = self.m.tryserver.gerrit_change_target_ref
+    if target_ref == 'refs/heads/master':
       return 'HEAD'
 
-    # Query Gerrit to check if a CL's destination branch differs from master.
-    destination_branch = self.m.gerrit.get_change_destination_branch(
-        host=self._gerrit,
-        change=self._issue,
-        name='get_patch_destination_branch',
-    )
+    # TODO: Remove. Return ref, not branch.
+    ret = target_ref
+    prefix = 'refs/heads/'
+    if ret.startswith(prefix):
+      ret = ret[len(prefix):]
 
-    # Only use prefix if different from bot_update.py's default.
-    return destination_branch if destination_branch != 'master' else 'HEAD'
+    return ret
 
   def _resolve_fixed_revisions(self, bot_update_json):
     """Set all fixed revisions from the first sync to their respective

data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/basic.json

@@ -6,8 +6,6 @@
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--spec-path",
       "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
-      "--patch_root",
-      "src",
       "--revision_mapping_file",
       "{\"got_angle_revision\": \"src/third_party/angle\", \"got_cr_revision\": \"src\", \"got_revision\": \"src\", \"got_v8_revision\": \"src/v8\"}",
       "--git-cache-dir",
@@ -17,12 +15,12 @@
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "src@abc",
+      "src@2d72510e447ab60a9728aeea2362d8be2cbd7789",
       "--disable-syntax-validation"
     ],
     "env_prefixes": {
       "PATH": [
-        "RECIPE_PACKAGE_REPO[depot_tools]"
+        "RECIPE_REPO[depot_tools]"
       ]
     },
     "infra_step": true,
@@ -32,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": \"abc\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
@@ -98,8 +96,7 @@
     ]
   },
   {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
+    "jsonResult": null,
+    "name": "$result"
   }
 ]