[tricium] Don't skip patching recipe changes
We don't plan on running the fuchsia tricium builder in recipes CQ any
time soon (unlike regular fuchsia builders) so the only tricium builder
that will run in recipes CQ is the dedicated tricium-recipes builder.
That builder actually checks out the recipes jiri manifest and patches
in the CL so it can analyze the recipe code, so it's safe (and
necessary) to patch the recipes repo for this builder.
Test: https://ci.chromium.org/swarming/task/4f8f0ec7679d6110
(If you look at the associated CL, the changed files correspond to the
files checked by the recipe.)
Bug: 58899
Change-Id: I39b52da68ca67b4380905cff611f665dcd09aaa4
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/445155
Reviewed-by: Anthony Fandrianto <atyfto@google.com>
Commit-Queue: Oliver Newman <olivernewman@google.com>
diff --git a/recipe_modules/checkout/api.py b/recipe_modules/checkout/api.py
index e1682c0..c06f85f 100644
--- a/recipe_modules/checkout/api.py
+++ b/recipe_modules/checkout/api.py
@@ -477,29 +477,31 @@
attributes=(),
is_release_version=False,
timeout_secs=30 * 60,
+ skip_patch_projects=SKIP_PATCH_PROJECTS,
):
"""Uses Jiri to check out a Fuchsia project.
The root of the checkout is returned via _CheckoutResults.root_dir.
Args:
- path (Path): The Fuchsia checkout root.
- build (buildbucket.build_pb2.Build): A buildbucket build.
- manifest (str): A path to the manifest in the remote (e.g. manifest/minimal)
- remote (str): A URL to the remote repository which Jiri will be pointed at
- project (str): The name of the project
- rebase_revision (str): The base revision to patch on top of, if the
- build input is a Gerrit Change. TODO(kjharland): This is hacky, find a
- better way to carry this information through to `from_patchset`.
- attributes (seq(str)): A list of jiri manifest attributes; projects or
- packages with matching attributes - otherwise regarded as optional -
- will be downloaded.
- is_release_version (bool): Whether the checkout is a release version.
- timeout_secs (int): How long to wait for the checkout to complete
- before failing
+ path (Path): The Fuchsia checkout root.
+ build (buildbucket.build_pb2.Build): A buildbucket build.
+ manifest (str): A path to the manifest in the remote (e.g. manifest/minimal)
+ remote (str): A URL to the remote repository which Jiri will be pointed at
+ rebase_revision (str): The base revision to patch on top of, if the
+ build input is a Gerrit Change. TODO(kjharland): This is hacky, find a
+ better way to carry this information through to `from_patchset`.
+ attributes (seq(str)): A list of jiri manifest attributes; projects or
+ packages with matching attributes - otherwise regarded as optional -
+ will be downloaded.
+ is_release_version (bool): Whether the checkout is a release version.
+ timeout_secs (int): How long to wait for the checkout to complete
+ before failing
+ skip_patch_projects (seq(str)): Do not attempt to patch these
+ projects.
Returns:
- A _CheckoutResults containing details of the checkout.
+ A _CheckoutResults containing details of the checkout.
"""
try:
source_info = self.with_options(
@@ -512,6 +514,7 @@
attributes=attributes,
build_input=build.input,
timeout_secs=timeout_secs,
+ skip_patch_projects=skip_patch_projects,
)
except self.m.jiri.RebaseError:
# A failure to rebase is closer to user error than an infra failure.
diff --git a/recipes/tricium/tricium.py b/recipes/tricium/tricium.py
index b88f1d6..2794b3e 100644
--- a/recipes/tricium/tricium.py
+++ b/recipes/tricium/tricium.py
@@ -50,6 +50,9 @@
build=api.buildbucket.build,
manifest=manifest,
remote=remote,
+ # Tricium should always be triggered on CLs that affect projects in
+ # the checkout, so we shouldn't skip patching any CLs.
+ skip_patch_projects=(),
)
project_name = api.buildbucket.build.input.gerrit_changes[0].project
