make recipes python3 compatible This updates recipes.py with $ curl https://chromium.googlesource.com/infra/luci/recipes-py/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/recipes.py?format=TEXT |\ base64 -d > infra/recipes.py And fixed some str/bytes usage in step/raw_io recipe modules. Bug: 283 Change-Id: Ib714244beb8971dcbd462544069fcb60c9b58a01 Reviewed-on: https://gn-review.googlesource.com/c/gn/+/13400 Reviewed-by: Petr Hosek <phosek@google.com> Commit-Queue: Takuto Ikuta <tikuta@google.com>
diff --git a/infra/README.recipes.md b/infra/README.recipes.md index fabdf85..c2737de 100644 --- a/infra/README.recipes.md +++ b/infra/README.recipes.md
@@ -3,20 +3,22 @@ ## Table of Contents **[Recipe Modules](#Recipe-Modules)** - * [macos_sdk](#recipe_modules-macos_sdk) — The `macos_sdk` module provides safe functions to access a semi-hermetic XCode installation. - * [target](#recipe_modules-target) - * [windows_sdk](#recipe_modules-windows_sdk) + * [macos_sdk](#recipe_modules-macos_sdk) (Python3 ✅) — The `macos_sdk` module provides safe functions to access a semi-hermetic XCode installation. + * [target](#recipe_modules-target) (Python3 ✅) + * [windows_sdk](#recipe_modules-windows_sdk) (Python3 ✅) **[Recipes](#Recipes)** - * [gn](#recipes-gn) — Recipe for building GN. - * [macos_sdk:examples/full](#recipes-macos_sdk_examples_full) - * [target:examples/full](#recipes-target_examples_full) - * [windows_sdk:examples/full](#recipes-windows_sdk_examples_full) + * [gn](#recipes-gn) (Python3 ✅) — Recipe for building GN. + * [macos_sdk:examples/full](#recipes-macos_sdk_examples_full) (Python3 ✅) + * [target:examples/full](#recipes-target_examples_full) (Python3 ✅) + * [windows_sdk:examples/full](#recipes-windows_sdk_examples_full) (Python3 ✅) ## Recipe Modules ### *recipe_modules* / [macos\_sdk](/infra/recipe_modules/macos_sdk) -[DEPS](/infra/recipe_modules/macos_sdk/__init__.py#5): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/infra/recipe_modules/macos_sdk/__init__.py#7): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/step][recipe_engine/recipe_modules/step] + +PYTHON_VERSION_COMPATIBILITY: PY2+3 The `macos_sdk` module provides safe functions to access a semi-hermetic XCode installation. @@ -64,14 +66,18 @@   **@property**<br>— **def [sdk\_dir](/infra/recipe_modules/macos_sdk/api.py#25)(self):** ### *recipe_modules* / [target](/infra/recipe_modules/target) -[DEPS](/infra/recipe_modules/target/__init__.py#5): [recipe\_engine/platform][recipe_engine/recipe_modules/platform] +[DEPS](/infra/recipe_modules/target/__init__.py#7): [recipe\_engine/platform][recipe_engine/recipe_modules/platform] + +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [TargetApi](/infra/recipe_modules/target/api.py#82)([RecipeApi][recipe_engine/wkt/RecipeApi]):**   **@property**<br>— **def [host](/infra/recipe_modules/target/api.py#87)(self):** ### *recipe_modules* / [windows\_sdk](/infra/recipe_modules/windows_sdk) -[DEPS](/infra/recipe_modules/windows_sdk/__init__.py#5): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/infra/recipe_modules/windows_sdk/__init__.py#7): [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/step][recipe_engine/recipe_modules/step] + +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [WindowsSDKApi](/infra/recipe_modules/windows_sdk/api.py#10)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -89,36 +95,44 @@ ### *recipes* / [gn](/infra/recipes/gn.py) -[DEPS](/infra/recipes/gn.py#8): [macos\_sdk](#recipe_modules-macos_sdk), [target](#recipe_modules-target), [windows\_sdk](#recipe_modules-windows_sdk), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/infra/recipes/gn.py#10): [macos\_sdk](#recipe_modules-macos_sdk), [target](#recipe_modules-target), [windows\_sdk](#recipe_modules-windows_sdk), [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step] + +PYTHON_VERSION_COMPATIBILITY: PY2+3 Recipe for building GN. -— **def [RunSteps](/infra/recipes/gn.py#102)(api, repository):** +— **def [RunSteps](/infra/recipes/gn.py#104)(api, repository):** ### *recipes* / [macos\_sdk:examples/full](/infra/recipe_modules/macos_sdk/examples/full.py) -[DEPS](/infra/recipe_modules/macos_sdk/examples/full.py#5): [macos\_sdk](#recipe_modules-macos_sdk), [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/infra/recipe_modules/macos_sdk/examples/full.py#7): [macos\_sdk](#recipe_modules-macos_sdk), [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] -— **def [RunSteps](/infra/recipe_modules/macos_sdk/examples/full.py#13)(api):** +PYTHON_VERSION_COMPATIBILITY: PY2+3 + +— **def [RunSteps](/infra/recipe_modules/macos_sdk/examples/full.py#15)(api):** ### *recipes* / [target:examples/full](/infra/recipe_modules/target/examples/full.py) -[DEPS](/infra/recipe_modules/target/examples/full.py#5): [target](#recipe_modules-target), [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/infra/recipe_modules/target/examples/full.py#7): [target](#recipe_modules-target), [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] -— **def [RunSteps](/infra/recipe_modules/target/examples/full.py#13)(api):** +PYTHON_VERSION_COMPATIBILITY: PY2+3 + +— **def [RunSteps](/infra/recipe_modules/target/examples/full.py#15)(api):** ### *recipes* / [windows\_sdk:examples/full](/infra/recipe_modules/windows_sdk/examples/full.py) -[DEPS](/infra/recipe_modules/windows_sdk/examples/full.py#5): [windows\_sdk](#recipe_modules-windows_sdk), [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/infra/recipe_modules/windows_sdk/examples/full.py#7): [windows\_sdk](#recipe_modules-windows_sdk), [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step] -— **def [RunSteps](/infra/recipe_modules/windows_sdk/examples/full.py#13)(api):** +PYTHON_VERSION_COMPATIBILITY: PY2+3 -[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-buildbucket -[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-cipd -[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-context -[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-file -[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-json -[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-path -[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-platform -[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-properties -[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-python -[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/README.recipes.md#recipe_modules-step -[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/d31ba13ede8c21e60116ae61e4490d53ba77fcbd/recipe_engine/recipe_api.py#856 +— **def [RunSteps](/infra/recipe_modules/windows_sdk/examples/full.py#15)(api):** + +[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-buildbucket +[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-cipd +[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-context +[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-file +[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-json +[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-path +[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-platform +[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-properties +[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-python +[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-raw_io +[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/README.recipes.md#recipe_modules-step +[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/1b1ecd03e0b00399784c43add1465f685b6d1ab9/recipe_engine/recipe_api.py#883
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 4596382..df78f4f 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg
@@ -2,8 +2,8 @@ "api_version": 2, "deps": { "recipe_engine": { - "branch": "main", - "revision": "d31ba13ede8c21e60116ae61e4490d53ba77fcbd", + "branch": "refs/heads/main", + "revision": "1b1ecd03e0b00399784c43add1465f685b6d1ab9", "url": "https://chromium.googlesource.com/infra/luci/recipes-py" } },
diff --git a/infra/recipe_modules/macos_sdk/__init__.py b/infra/recipe_modules/macos_sdk/__init__.py index 56b6a94..550f433 100644 --- a/infra/recipe_modules/macos_sdk/__init__.py +++ b/infra/recipe_modules/macos_sdk/__init__.py
@@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +PYTHON_VERSION_COMPATIBILITY = 'PY2+3' + DEPS = [ 'recipe_engine/cipd', 'recipe_engine/context',
diff --git a/infra/recipe_modules/macos_sdk/examples/full.py b/infra/recipe_modules/macos_sdk/examples/full.py index a3348ab..242e3c5 100644 --- a/infra/recipe_modules/macos_sdk/examples/full.py +++ b/infra/recipe_modules/macos_sdk/examples/full.py
@@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +PYTHON_VERSION_COMPATIBILITY = 'PY2+3' + DEPS = [ 'macos_sdk', 'recipe_engine/platform',
diff --git a/infra/recipe_modules/target/__init__.py b/infra/recipe_modules/target/__init__.py index 1239fd2..a4f37ae 100644 --- a/infra/recipe_modules/target/__init__.py +++ b/infra/recipe_modules/target/__init__.py
@@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +PYTHON_VERSION_COMPATIBILITY = 'PY2+3' + DEPS = [ 'recipe_engine/platform', ]
diff --git a/infra/recipe_modules/target/examples/full.py b/infra/recipe_modules/target/examples/full.py index c47c86a..0a2090a 100644 --- a/infra/recipe_modules/target/examples/full.py +++ b/infra/recipe_modules/target/examples/full.py
@@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +PYTHON_VERSION_COMPATIBILITY = 'PY2+3' + DEPS = [ 'target', 'recipe_engine/platform',
diff --git a/infra/recipe_modules/windows_sdk/__init__.py b/infra/recipe_modules/windows_sdk/__init__.py index 83323a8..51b8492 100644 --- a/infra/recipe_modules/windows_sdk/__init__.py +++ b/infra/recipe_modules/windows_sdk/__init__.py
@@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +PYTHON_VERSION_COMPATIBILITY = 'PY2+3' + DEPS = [ 'recipe_engine/cipd', 'recipe_engine/context',
diff --git a/infra/recipe_modules/windows_sdk/examples/full.py b/infra/recipe_modules/windows_sdk/examples/full.py index 902c491..029e997 100644 --- a/infra/recipe_modules/windows_sdk/examples/full.py +++ b/infra/recipe_modules/windows_sdk/examples/full.py
@@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +PYTHON_VERSION_COMPATIBILITY = 'PY2+3' + DEPS = [ 'windows_sdk', 'recipe_engine/platform',
diff --git a/infra/recipes.py b/infra/recipes.py index 2fe0086..81b0bc6 100755 --- a/infra/recipes.py +++ b/infra/recipes.py
@@ -1,47 +1,59 @@ -#!/usr/bin/env python - -# Copyright 2017 The LUCI Authors. All rights reserved. +#!/bin/sh +# Copyright 2019 The LUCI Authors. All rights reserved. # Use of this source code is governed under the Apache License, Version 2.0 # that can be found in the LICENSE file. +# We want to run python in unbuffered mode; however shebangs on linux grab the +# entire rest of the shebang line as a single argument, leading to errors like: +# +# /usr/bin/env: 'python3 -u': No such file or directory +# +# This little shell hack is a triple-quoted noop in python, but in sh it +# evaluates to re-exec'ing this script in unbuffered mode. +# pylint: disable=pointless-string-statement +''''exec python3 -u -- "$0" ${1+"$@"} # ''' +# vi: syntax=python """Bootstrap script to clone and forward to the recipe engine tool. ******************* ** DO NOT MODIFY ** ******************* -This is a copy of https://chromium.googlesource.com/infra/luci/recipes-py/+/master/recipes.py. +This is a copy of https://chromium.googlesource.com/infra/luci/recipes-py/+/main/recipes.py. To fix bugs, fix in the googlesource repo then run the autoroller. """ +# pylint: disable=wrong-import-position import argparse +import errno import json import logging import os -import random import subprocess import sys -import time -import urlparse from collections import namedtuple +from io import open # pylint: disable=redefined-builtin -from cStringIO import StringIO +try: + import urllib.parse as urlparse +except ImportError: + import urlparse # The dependency entry for the recipe_engine in the client repo's recipes.cfg # # url (str) - the url to the engine repo we want to use. # revision (str) - the git revision for the engine to get. # branch (str) - the branch to fetch for the engine as an absolute ref (e.g. -# refs/heads/master) -EngineDep = namedtuple('EngineDep', - 'url revision branch') +# refs/heads/main) +EngineDep = namedtuple('EngineDep', 'url revision branch') class MalformedRecipesCfg(Exception): + def __init__(self, msg, path): - super(MalformedRecipesCfg, self).__init__('malformed recipes.cfg: %s: %r' - % (msg, path)) + full_message = 'malformed recipes.cfg: %s: %r' % (msg, path) + super(MalformedRecipesCfg, self).__init__(full_message) def parse(repo_root, recipes_cfg_path): @@ -59,7 +71,7 @@ current repo (i.e. the folder containing `recipes/` and/or `recipe_modules`) """ - with open(recipes_cfg_path, 'rU') as fh: + with open(recipes_cfg_path, 'r') as fh: pb = json.load(fh) try: @@ -79,27 +91,31 @@ if 'url' not in engine: raise MalformedRecipesCfg( - 'Required field "url" in dependency "recipe_engine" not found', - recipes_cfg_path) + 'Required field "url" in dependency "recipe_engine" not found', + recipes_cfg_path) engine.setdefault('revision', '') - engine.setdefault('branch', 'refs/heads/master') + engine.setdefault('branch', 'refs/heads/main') recipes_path = pb.get('recipes_path', '') # TODO(iannucci): only support absolute refs if not engine['branch'].startswith('refs/'): engine['branch'] = 'refs/heads/' + engine['branch'] - recipes_path = os.path.join( - repo_root, recipes_path.replace('/', os.path.sep)) + recipes_path = os.path.join(repo_root, + recipes_path.replace('/', os.path.sep)) return EngineDep(**engine), recipes_path except KeyError as ex: - raise MalformedRecipesCfg(ex.message, recipes_cfg_path) + raise MalformedRecipesCfg(str(ex), recipes_cfg_path) -_BAT = '.bat' if sys.platform.startswith(('win', 'cygwin')) else '' +IS_WIN = sys.platform.startswith(('win', 'cygwin')) + +_BAT = '.bat' if IS_WIN else '' GIT = 'git' + _BAT -VPYTHON = 'vpython' + _BAT +VPYTHON = ('vpython' + + ('3' if os.getenv('RECIPES_USE_PY3') == 'true' else '') + + _BAT) CIPD = 'cipd' + _BAT REQUIRED_BINARIES = {GIT, VPYTHON, CIPD} @@ -107,6 +123,7 @@ def _is_executable(path): return os.path.isfile(path) and os.access(path, os.X_OK) + # TODO: Use shutil.which once we switch to Python3. def _is_on_path(basename): for path in os.environ['PATH'].split(os.pathsep): @@ -122,13 +139,13 @@ def _git_check_call(argv, **kwargs): - argv = [GIT]+argv + argv = [GIT] + argv logging.info('Running %r', argv) subprocess.check_call(argv, **kwargs) def _git_output(argv, **kwargs): - argv = [GIT]+argv + argv = [GIT] + argv logging.info('Running %r', argv) return subprocess.check_output(argv, **kwargs) @@ -174,15 +191,26 @@ _git_check_call(['init', engine_path], stdout=NUL) try: - _git_check_call(['rev-parse', '--verify', '%s^{commit}' % revision], - cwd=engine_path, stdout=NUL, stderr=NUL) - except subprocess.CalledProcessError: - _git_check_call(['fetch', url, branch], cwd=engine_path, stdout=NUL, + _git_check_call(['rev-parse', '--verify', + '%s^{commit}' % revision], + cwd=engine_path, + stdout=NUL, stderr=NUL) + except subprocess.CalledProcessError: + _git_check_call(['fetch', '--quiet', url, branch], + cwd=engine_path, + stdout=NUL) try: _git_check_call(['diff', '--quiet', revision], cwd=engine_path) except subprocess.CalledProcessError: + index_lock = os.path.join(engine_path, '.git', 'index.lock') + try: + os.remove(index_lock) + except OSError as exc: + if exc.errno != errno.ENOENT: + logging.warn('failed to remove %r, reset will fail: %s', index_lock, + exc) _git_check_call(['reset', '-q', '--hard', revision], cwd=engine_path) # If the engine has refactored/moved modules we need to clean all .pyc files @@ -206,22 +234,31 @@ if recipes_cfg_path: # calculate repo_root from recipes_cfg_path repo_root = os.path.dirname( - os.path.dirname( - os.path.dirname(recipes_cfg_path))) + os.path.dirname(os.path.dirname(recipes_cfg_path))) else: # find repo_root with git and calculate recipes_cfg_path - repo_root = (_git_output( - ['rev-parse', '--show-toplevel'], - cwd=os.path.abspath(os.path.dirname(__file__))).strip()) - repo_root = os.path.abspath(repo_root) + repo_root = ( + _git_output(['rev-parse', '--show-toplevel'], + cwd=os.path.abspath(os.path.dirname(__file__))).strip()) + repo_root = os.path.abspath(repo_root).decode() recipes_cfg_path = os.path.join(repo_root, 'infra', 'config', 'recipes.cfg') args = ['--package', recipes_cfg_path] + args - engine_path = checkout_engine(engine_override, repo_root, recipes_cfg_path) - return _subprocess_call([ - VPYTHON, '-u', - os.path.join(engine_path, 'recipe_engine', 'main.py')] + args) + argv = ( + [VPYTHON, '-u', + os.path.join(engine_path, 'recipe_engine', 'main.py')] + args) + + if IS_WIN: + # No real 'exec' on windows; set these signals to ignore so that they + # propagate to our children but we still wait for the child process to quit. + import signal + signal.signal(signal.SIGBREAK, signal.SIG_IGN) + signal.signal(signal.SIGINT, signal.SIG_IGN) + signal.signal(signal.SIGTERM, signal.SIG_IGN) + return _subprocess_call(argv) + else: + os.execvp(argv[0], argv) if __name__ == '__main__':
diff --git a/infra/recipes/gn.expected/ci_linux.json b/infra/recipes/gn.expected/ci_linux.json index e63326d..25250ba 100644 --- a/infra/recipes/gn.expected/ci_linux.json +++ b/infra/recipes/gn.expected/ci_linux.json
@@ -10,6 +10,18 @@ "[START_DIR]/gn" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -25,6 +37,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -38,6 +62,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -51,6 +87,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.rev-parse", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -70,6 +118,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -105,6 +165,18 @@ "init", "[START_DIR]/rpmalloc" ], + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -120,6 +192,18 @@ ], "cwd": "[START_DIR]/rpmalloc", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -133,6 +217,18 @@ ], "cwd": "[START_DIR]/rpmalloc", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -150,6 +246,18 @@ "/path/to/tmp/" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.read [START_DIR]/rpmalloc/build/ninja/clang.py", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", @@ -169,6 +277,18 @@ "[START_DIR]/rpmalloc/build/ninja/clang.py" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.write [START_DIR]/rpmalloc/build/ninja/clang.py", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", @@ -202,6 +322,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-amd64.configure", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -220,6 +352,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-amd64.ninja", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -251,6 +395,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-arm64.configure", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -269,6 +425,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-arm64.ninja", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -300,6 +468,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -319,6 +499,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -336,6 +528,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -369,6 +573,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -388,6 +604,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -405,6 +633,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -438,6 +678,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.upload.build gn/gn/linux-amd64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -474,6 +726,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -493,6 +757,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -526,6 +802,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.upload.build gn/gn/linux-arm64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@",
diff --git a/infra/recipes/gn.expected/ci_mac.json b/infra/recipes/gn.expected/ci_mac.json index 90114ad..e32d3e4 100644 --- a/infra/recipes/gn.expected/ci_mac.json +++ b/infra/recipes/gn.expected/ci_mac.json
@@ -10,6 +10,18 @@ "[START_DIR]/gn" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -25,6 +37,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -38,6 +62,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -51,6 +87,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.rev-parse", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -70,6 +118,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -103,6 +163,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -130,6 +202,18 @@ "[CACHE]/macos_sdk/XCode.app" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "install xcode" }, { @@ -140,6 +224,18 @@ "[CACHE]/macos_sdk/XCode.app" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "select XCode" }, { @@ -151,11 +247,23 @@ "xcrun", "--show-sdk-path" ], + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.xcrun sdk-path", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[sdk-path]@/some/xcode/path@@@", - "@@@STEP_LOG_END@raw_io.output[sdk-path]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@", + "@@@STEP_LOG_END@raw_io.output_text[sdk-path]@@@" ] }, { @@ -169,11 +277,23 @@ "-Wp,-v", "-" ], + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.xcrun toolchain", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", - "@@@STEP_LOG_END@raw_io.output[toolchain]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", + "@@@STEP_LOG_END@raw_io.output_text[toolchain]@@@" ] }, { @@ -198,6 +318,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.mac-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -217,6 +349,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.mac-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -234,6 +378,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.mac-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -248,11 +404,23 @@ "xcrun", "--show-sdk-path" ], + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.xcrun sdk-path", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[sdk-path]@/some/xcode/path@@@", - "@@@STEP_LOG_END@raw_io.output[sdk-path]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@", + "@@@STEP_LOG_END@raw_io.output_text[sdk-path]@@@" ] }, { @@ -266,11 +434,23 @@ "-Wp,-v", "-" ], + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.xcrun toolchain", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", - "@@@STEP_LOG_END@raw_io.output[toolchain]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", + "@@@STEP_LOG_END@raw_io.output_text[toolchain]@@@" ] }, { @@ -296,6 +476,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -315,6 +507,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -332,6 +536,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -365,6 +581,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-amd64.upload.build gn/gn/mac-amd64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -382,11 +610,23 @@ "xcrun", "--show-sdk-path" ], + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.xcrun sdk-path (2)", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[sdk-path]@/some/xcode/path@@@", - "@@@STEP_LOG_END@raw_io.output[sdk-path]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@", + "@@@STEP_LOG_END@raw_io.output_text[sdk-path]@@@" ] }, { @@ -400,11 +640,23 @@ "-Wp,-v", "-" ], + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.xcrun toolchain (2)", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", - "@@@STEP_LOG_END@raw_io.output[toolchain]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", + "@@@STEP_LOG_END@raw_io.output_text[toolchain]@@@" ] }, { @@ -430,6 +682,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=arm64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-arm64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -449,6 +713,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=arm64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-arm64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -482,6 +758,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=arm64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-arm64.upload.build gn/gn/mac-arm64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -501,6 +789,18 @@ "--reset" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "reset XCode" }, {
diff --git a/infra/recipes/gn.expected/ci_win.json b/infra/recipes/gn.expected/ci_win.json index fcdc658..e1a74d6 100644 --- a/infra/recipes/gn.expected/ci_win.json +++ b/infra/recipes/gn.expected/ci_win.json
@@ -10,6 +10,18 @@ "[START_DIR]\\gn" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -25,6 +37,18 @@ ], "cwd": "[START_DIR]\\gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -38,6 +62,18 @@ ], "cwd": "[START_DIR]\\gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -51,6 +87,18 @@ ], "cwd": "[START_DIR]\\gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.rev-parse", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -70,6 +118,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -99,6 +159,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -122,6 +194,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\SetEnv.x64.json", "/path/to/tmp/json" ], + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "read SetEnv.x64.json", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -173,6 +257,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.windows-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -193,6 +289,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.windows-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -211,6 +319,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.windows-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -244,6 +364,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.windows-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -264,6 +396,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.windows-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -282,6 +426,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.windows-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -316,6 +472,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.windows-amd64.upload.build gn/gn/windows-amd64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -336,6 +504,18 @@ "/im", "mspdbsrv.exe" ], + "luci_context": { + "realm": { + "name": "gn:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "taskkill mspdbsrv" }, {
diff --git a/infra/recipes/gn.expected/cipd_exists.json b/infra/recipes/gn.expected/cipd_exists.json index 0a5dba9..abde3b5 100644 --- a/infra/recipes/gn.expected/cipd_exists.json +++ b/infra/recipes/gn.expected/cipd_exists.json
@@ -10,6 +10,18 @@ "[START_DIR]/gn" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -25,6 +37,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -38,6 +62,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -51,6 +87,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.rev-parse", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -70,6 +118,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -105,6 +165,18 @@ "init", "[START_DIR]/rpmalloc" ], + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -120,6 +192,18 @@ ], "cwd": "[START_DIR]/rpmalloc", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -133,6 +217,18 @@ ], "cwd": "[START_DIR]/rpmalloc", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -150,6 +246,18 @@ "/path/to/tmp/" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.read [START_DIR]/rpmalloc/build/ninja/clang.py", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", @@ -169,6 +277,18 @@ "[START_DIR]/rpmalloc/build/ninja/clang.py" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.write [START_DIR]/rpmalloc/build/ninja/clang.py", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", @@ -202,6 +322,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-amd64.configure", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -220,6 +352,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-amd64.ninja", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -251,6 +395,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-arm64.configure", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -269,6 +425,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-arm64.ninja", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -300,6 +468,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -319,6 +499,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -336,6 +528,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -369,6 +573,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -388,6 +604,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -405,6 +633,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -438,6 +678,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.upload.build gn/gn/linux-amd64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -468,6 +720,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.upload.cipd search gn/gn/linux-amd64 git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -513,6 +777,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -532,6 +808,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -565,6 +853,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.upload.build gn/gn/linux-arm64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -595,6 +895,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.upload.cipd search gn/gn/linux-arm64 git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@",
diff --git a/infra/recipes/gn.expected/cipd_register.json b/infra/recipes/gn.expected/cipd_register.json index b5e173a..0d3ce42 100644 --- a/infra/recipes/gn.expected/cipd_register.json +++ b/infra/recipes/gn.expected/cipd_register.json
@@ -10,6 +10,18 @@ "[START_DIR]/gn" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -25,6 +37,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -38,6 +62,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -51,6 +87,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.rev-parse", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -70,6 +118,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -105,6 +165,18 @@ "init", "[START_DIR]/rpmalloc" ], + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -120,6 +192,18 @@ ], "cwd": "[START_DIR]/rpmalloc", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -133,6 +217,18 @@ ], "cwd": "[START_DIR]/rpmalloc", "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -150,6 +246,18 @@ "/path/to/tmp/" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.read [START_DIR]/rpmalloc/build/ninja/clang.py", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", @@ -169,6 +277,18 @@ "[START_DIR]/rpmalloc/build/ninja/clang.py" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.write [START_DIR]/rpmalloc/build/ninja/clang.py", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", @@ -202,6 +322,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-amd64.configure", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -220,6 +352,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-amd64.ninja", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -251,6 +395,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-arm64.configure", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -269,6 +425,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-arm64.ninja", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -300,6 +468,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -319,6 +499,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -336,6 +528,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -369,6 +573,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -388,6 +604,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -405,6 +633,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -438,6 +678,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.upload.build gn/gn/linux-amd64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -468,6 +720,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.upload.cipd search gn/gn/linux-amd64 git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -499,6 +763,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.upload.register gn/gn/linux-amd64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -536,6 +812,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -555,6 +843,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -588,6 +888,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.upload.build gn/gn/linux-arm64", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@", @@ -618,6 +930,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "infra-internal:ci" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.upload.cipd search gn/gn/linux-arm64 git_revision:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@3@@@",
diff --git a/infra/recipes/gn.expected/cq_linux.json b/infra/recipes/gn.expected/cq_linux.json index daea41e..d19691e 100644 --- a/infra/recipes/gn.expected/cq_linux.json +++ b/infra/recipes/gn.expected/cq_linux.json
@@ -10,6 +10,18 @@ "[START_DIR]/gn" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -25,6 +37,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -38,6 +62,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -51,6 +87,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.rev-parse", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -65,6 +113,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch 123456/7", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -78,6 +138,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout 123456/7", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -97,6 +169,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -132,6 +216,18 @@ "init", "[START_DIR]/rpmalloc" ], + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -147,6 +243,18 @@ ], "cwd": "[START_DIR]/rpmalloc", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -160,6 +268,18 @@ ], "cwd": "[START_DIR]/rpmalloc", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -177,6 +297,18 @@ "/path/to/tmp/" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.read [START_DIR]/rpmalloc/build/ninja/clang.py", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", @@ -196,6 +328,18 @@ "[START_DIR]/rpmalloc/build/ninja/clang.py" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.write [START_DIR]/rpmalloc/build/ninja/clang.py", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", @@ -229,6 +373,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-amd64.configure", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -247,6 +403,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-amd64.ninja", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -278,6 +446,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-arm64.configure", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -296,6 +476,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "rpmalloc.build rpmalloc-linux-arm64.ninja", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -327,6 +519,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -346,6 +550,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -363,6 +579,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.linux-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -396,6 +624,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -415,6 +655,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -432,6 +684,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -461,6 +725,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -480,6 +756,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=aarch64-linux-gnu --sysroot=[START_DIR]/cipd/sysroot -static-libstdc++" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.linux-arm64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@"
diff --git a/infra/recipes/gn.expected/cq_mac.json b/infra/recipes/gn.expected/cq_mac.json index 908c60d..fca25f6 100644 --- a/infra/recipes/gn.expected/cq_mac.json +++ b/infra/recipes/gn.expected/cq_mac.json
@@ -10,6 +10,18 @@ "[START_DIR]/gn" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -25,6 +37,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -38,6 +62,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -51,6 +87,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.rev-parse", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -65,6 +113,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch 123456/7", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -78,6 +138,18 @@ ], "cwd": "[START_DIR]/gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout 123456/7", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -97,6 +169,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -130,6 +214,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -157,6 +253,18 @@ "[CACHE]/macos_sdk/XCode.app" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "install xcode" }, { @@ -167,6 +275,18 @@ "[CACHE]/macos_sdk/XCode.app" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "select XCode" }, { @@ -178,11 +298,23 @@ "xcrun", "--show-sdk-path" ], + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.xcrun sdk-path", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[sdk-path]@/some/xcode/path@@@", - "@@@STEP_LOG_END@raw_io.output[sdk-path]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@", + "@@@STEP_LOG_END@raw_io.output_text[sdk-path]@@@" ] }, { @@ -196,11 +328,23 @@ "-Wp,-v", "-" ], + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.xcrun toolchain", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", - "@@@STEP_LOG_END@raw_io.output[toolchain]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", + "@@@STEP_LOG_END@raw_io.output_text[toolchain]@@@" ] }, { @@ -225,6 +369,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.mac-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -244,6 +400,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.mac-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -261,6 +429,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.mac-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -275,11 +455,23 @@ "xcrun", "--show-sdk-path" ], + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.xcrun sdk-path", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[sdk-path]@/some/xcode/path@@@", - "@@@STEP_LOG_END@raw_io.output[sdk-path]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@", + "@@@STEP_LOG_END@raw_io.output_text[sdk-path]@@@" ] }, { @@ -293,11 +485,23 @@ "-Wp,-v", "-" ], + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.xcrun toolchain", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", - "@@@STEP_LOG_END@raw_io.output[toolchain]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", + "@@@STEP_LOG_END@raw_io.output_text[toolchain]@@@" ] }, { @@ -323,6 +527,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -342,6 +558,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -359,6 +587,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=x86_64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -369,11 +609,23 @@ "xcrun", "--show-sdk-path" ], + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.xcrun sdk-path (2)", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[sdk-path]@/some/xcode/path@@@", - "@@@STEP_LOG_END@raw_io.output[sdk-path]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[sdk-path]@/some/xcode/path@@@", + "@@@STEP_LOG_END@raw_io.output_text[sdk-path]@@@" ] }, { @@ -387,11 +639,23 @@ "-Wp,-v", "-" ], + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.xcrun toolchain (2)", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@raw_io.output[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", - "@@@STEP_LOG_END@raw_io.output[toolchain]@@@" + "@@@STEP_LOG_LINE@raw_io.output_text[toolchain]@[CACHE]/macos_sdk/XCode.app/include/c++/v1@@@", + "@@@STEP_LOG_END@raw_io.output_text[toolchain]@@@" ] }, { @@ -417,6 +681,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=arm64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-arm64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -436,6 +712,18 @@ "CXX": "[START_DIR]/cipd/bin/clang++", "LDFLAGS": "--target=arm64-apple-darwin --sysroot=/some/xcode/path" }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.mac-arm64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -448,6 +736,18 @@ "--reset" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "reset XCode" }, {
diff --git a/infra/recipes/gn.expected/cq_win.json b/infra/recipes/gn.expected/cq_win.json index 5612924..df7c728 100644 --- a/infra/recipes/gn.expected/cq_win.json +++ b/infra/recipes/gn.expected/cq_win.json
@@ -10,6 +10,18 @@ "[START_DIR]\\gn" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.init", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -25,6 +37,18 @@ ], "cwd": "[START_DIR]\\gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -38,6 +62,18 @@ ], "cwd": "[START_DIR]\\gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -51,6 +87,18 @@ ], "cwd": "[START_DIR]\\gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.rev-parse", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -65,6 +113,18 @@ ], "cwd": "[START_DIR]\\gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.fetch 123456/7", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -78,6 +138,18 @@ ], "cwd": "[START_DIR]\\gn", "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "git.checkout 123456/7", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" @@ -97,6 +169,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -126,6 +210,18 @@ "/path/to/tmp/json" ], "infra_step": true, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "ensure_installed (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -149,6 +245,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\SetEnv.x64.json", "/path/to/tmp/json" ], + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "read SetEnv.x64.json", "~followup_annotations": [ "@@@STEP_LOG_LINE@json.output@{@@@", @@ -200,6 +308,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.windows-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -220,6 +340,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.windows-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -238,6 +370,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "debug.windows-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -271,6 +415,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.windows-amd64.generate", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -291,6 +447,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.windows-amd64.build", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -309,6 +477,18 @@ "[CACHE]\\windows_sdk\\win_sdk\\bin\\x64" ] }, + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "release.windows-amd64.test", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -322,6 +502,18 @@ "/im", "mspdbsrv.exe" ], + "luci_context": { + "realm": { + "name": "gn:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, "name": "taskkill mspdbsrv" }, {
diff --git a/infra/recipes/gn.py b/infra/recipes/gn.py index e8fcff1..d99aa62 100644 --- a/infra/recipes/gn.py +++ b/infra/recipes/gn.py
@@ -5,6 +5,8 @@ from recipe_engine.recipe_api import Property +PYTHON_VERSION_COMPATIBILITY = 'PY2+3' + DEPS = [ 'recipe_engine/buildbucket', 'recipe_engine/cipd', @@ -44,8 +46,8 @@ 'xcrun', '--toolchain', 'clang', 'clang++', '-xc++', '-fsyntax-only', '-Wp,-v', '-' ], - stderr=api.raw_io.output(name='toolchain', add_output_log=True), - step_test_data=lambda: api.raw_io.test_api.stream_output( + stderr=api.raw_io.output_text(name='toolchain', add_output_log=True), + step_test_data=lambda: api.raw_io.test_api.stream_output_text( str(api.macos_sdk.sdk_dir.join('include', 'c++', 'v1')), stream='stderr')).stderr.splitlines() # Iterate over all include paths and look for the SDK libc++ one. @@ -72,8 +74,8 @@ triple = '--target=%s' % target.triple sysroot = '--sysroot=%s' % api.step( 'xcrun sdk-path', ['xcrun', '--show-sdk-path'], - stdout=api.raw_io.output(name='sdk-path', add_output_log=True), - step_test_data=lambda: api.raw_io.test_api.stream_output( + stdout=api.raw_io.output_text(name='sdk-path', add_output_log=True), + step_test_data=lambda: api.raw_io.test_api.stream_output_text( '/some/xcode/path')).stdout.strip() stdlib = cipd_dir.join('lib', 'libc++.a') cxx_include = _get_libcxx_include_path(api) @@ -117,7 +119,7 @@ api.step('checkout', ['git', 'checkout', 'FETCH_HEAD']) revision = api.step( 'rev-parse', ['git', 'rev-parse', 'HEAD'], - stdout=api.raw_io.output()).stdout.strip() + stdout=api.raw_io.output_text()).stdout.strip() for change in build_input.gerrit_changes: api.step('fetch %s/%s' % (change.change, change.patchset), [ 'git', 'fetch', repository, @@ -319,7 +321,7 @@ git_repo='gn.googlesource.com/gn', revision='a' * 40, ) + api.step_data( - 'git.rev-parse', api.raw_io.stream_output('a' * 40) + 'git.rev-parse', api.raw_io.stream_output_text('a' * 40) ) + api.step_data( 'release.linux-amd64.upload.cipd search gn/gn/linux-amd64 git_revision:' + 'a' * 40, @@ -331,7 +333,7 @@ git_repo='gn.googlesource.com/gn', revision='a' * 40, ) + api.step_data( - 'git.rev-parse', api.raw_io.stream_output('a' * 40) + 'git.rev-parse', api.raw_io.stream_output_text('a' * 40) ) + api.step_data( 'release.linux-amd64.upload.cipd search gn/gn/linux-amd64 git_revision:' + 'a' * 40, api.cipd.example_search('gn/gn/linux-amd64', [])))