diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 132d5483d7..ac3a15e093 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1042,7 +1042,7 @@ PYTHON_VERSION_COMPATIBILITY: PY3 PYTHON_VERSION_COMPATIBILITY: PY3 -— **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#68)(api):** +— **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#69)(api):** ### *recipes* / [gclient:tests/diff\_deps](/recipes/recipe_modules/gclient/tests/diff_deps.py) [DEPS](/recipes/recipe_modules/gclient/tests/diff_deps.py#10): [gclient](#recipe_modules-gclient), [recipe\_engine/assertions][recipe_engine/recipe_modules/assertions], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [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/raw\_io][recipe_engine/recipe_modules/raw_io] diff --git a/recipes/recipe_modules/gclient/config.py b/recipes/recipe_modules/gclient/config.py index 4d5963f46f..e23796fd83 100644 --- a/recipes/recipe_modules/gclient/config.py +++ b/recipes/recipe_modules/gclient/config.py @@ -285,13 +285,14 @@ def expect_tests(c): c.got_revision_mapping['expect_tests'] = 'got_revision' +# TODO(crbug.com/1415507): Delete the old infra configs and rename +# the _superproject configs after migration deadline. @config_ctx() def infra_superproject(c): soln = c.solutions.add() soln.name = '.' soln.url = 'https://chromium.googlesource.com/infra/infra_superproject.git' - # TODO(crbug.com/1415507): When builders can checkout internal code, add - # soln.custom_vars = {'checkout_internal': True} + c.got_revision_mapping['infra'] = 'got_revision' c.repo_path_map.update({ 'https://chromium.googlesource.com/infra/luci/gae': ('infra/go/src/go.chromium.org/gae', 'HEAD'), @@ -304,6 +305,15 @@ def infra_superproject(c): }) +@config_ctx() +def infra_internal_superproject(c): + soln = c.solutions.add() + soln.name = '.' + soln.custom_vars = {'checkout_internal': True} + soln.url = 'https://chromium.googlesource.com/infra/infra_superproject.git' + c.got_revision_mapping['infra_internal'] = 'got_revision' + + @config_ctx() def infra(c): soln = c.solutions.add() diff --git a/recipes/recipe_modules/gclient/examples/full.py b/recipes/recipe_modules/gclient/examples/full.py index 98fa0772ce..95e7011a7b 100644 --- a/recipes/recipe_modules/gclient/examples/full.py +++ b/recipes/recipe_modules/gclient/examples/full.py @@ -15,53 +15,54 @@ DEPS = [ TEST_CONFIGS = [ - 'android', - 'boringssl', - 'build_internal', - 'build_internal_scripts_slave', - 'catapult', - 'celab', - 'crashpad', - 'crossbench', - 'custom_tabs_client', - 'dart', - 'dawn', - 'emscripten_releases', - 'expect_tests', - 'gerrit', - 'gerrit_plugins_binary_size', - 'gerrit_plugins_buildbucket', - 'gerrit_plugins_chromium_behavior', - 'gerrit_plugins_chromium_binary_size', - 'gerrit_plugins_chromium_style', - 'gerrit_plugins_chumpdetector', - 'gerrit_plugins_code_coverage', - 'gerrit_plugins_git_numberer', - 'gerrit_plugins_landingwidget', - 'gerrit_plugins_tricium', - 'gerrit_test_cq_normal', - 'gyp', - 'infra', - 'infra_superproject', - 'infradata_master_manager', - 'infradata_config', - 'infradata_rbe', - 'internal_deps', - 'luci_gae', - 'luci_go', - 'luci_py', - 'master_deps', - 'nacl', - 'devtools', - 'openscreen', - 'pdfium', - 'recipes_py', - 'recipes_py_bare', - 'slave_deps', - 'tint', - 'webports', - 'with_branch_heads', - 'with_tags', + 'android', + 'boringssl', + 'build_internal', + 'build_internal_scripts_slave', + 'catapult', + 'celab', + 'crashpad', + 'crossbench', + 'custom_tabs_client', + 'dart', + 'dawn', + 'emscripten_releases', + 'expect_tests', + 'gerrit', + 'gerrit_plugins_binary_size', + 'gerrit_plugins_buildbucket', + 'gerrit_plugins_chromium_behavior', + 'gerrit_plugins_chromium_binary_size', + 'gerrit_plugins_chromium_style', + 'gerrit_plugins_chumpdetector', + 'gerrit_plugins_code_coverage', + 'gerrit_plugins_git_numberer', + 'gerrit_plugins_landingwidget', + 'gerrit_plugins_tricium', + 'gerrit_test_cq_normal', + 'gyp', + 'infra', + 'infra_superproject', + 'infra_internal_superproject', + 'infradata_master_manager', + 'infradata_config', + 'infradata_rbe', + 'internal_deps', + 'luci_gae', + 'luci_go', + 'luci_py', + 'master_deps', + 'nacl', + 'devtools', + 'openscreen', + 'pdfium', + 'recipes_py', + 'recipes_py_bare', + 'slave_deps', + 'tint', + 'webports', + 'with_branch_heads', + 'with_tags', ]