Roll recipe dependencies (nontrivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.
The build that created this CL was
https://ci.chromium.org/b/8763235787480904705
Please review the expectation changes, and LGTM+CQ.
recipe_engine:
https://chromium.googlesource.com/infra/luci/recipes-py/+/c6e4e93c25d3e1c2a9f60c00c20624c5a8ab9a0c
c6e4e93 (mohrr@google.com)
[defer] Drop "collect" step
Please check the following references for more information:
- autoroller, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#autoroller
- rollback, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#rollback
- cross-repo dependencies, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/cross_repo.md
Use https://goo.gl/noib3a to file a bug.
R=mohrr@google.com, tpudlik@google.com
Recipe-Tryjob-Bypass-Reason: Autoroller
Ignore-Freeze: Autoroller
Bugdroid-Send-Email: False
Change-Id: I144cdd6a931bbf5b22470a2168cf56d69a931fee
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/182712
Reviewed-by: Rob Mohr <mohrr@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
Commit-Queue: Recipe Deps Roller <recipe-deps-roller@pigweed-service-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index f390ead..c2b65c0 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -17,12 +17,12 @@
"deps": {
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "9a813e36a4f201449b5046160ae566810b207a1a",
+ "revision": "3a8d712acedb7baa9ce3d51218ccfcad8357609f",
"url": "https://fuchsia.googlesource.com/infra/recipes"
},
"recipe_engine": {
"branch": "refs/heads/main",
- "revision": "259924fefef10cb9475cc491439853971ab334d6",
+ "revision": "c6e4e93c25d3e1c2a9f60c00c20624c5a8ab9a0c",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py"
}
},
diff --git a/recipe_modules/pw_presubmit/tests/full.expected/substep.json b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
index 02cc763..cec0350 100644
--- a/recipe_modules/pw_presubmit/tests/full.expected/substep.json
+++ b/recipe_modules/pw_presubmit/tests/full.expected/substep.json
@@ -1034,38 +1034,6 @@
]
},
{
- "cmd": [],
- "name": "composite.collect",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@1 deferred failures@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@Traceback (most recent call last):@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ File \"RECIPE_REPO[recipe_engine]/recipe_modules/defer/api.py\", in __call__@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ return DeferredResult(_api=self.m, _value=func(*args, **kwargs))@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ ^^^^^^^^^^^^^^^^^^^^^@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ File \"RECIPE_REPO[pigweed]/recipe_modules/pw_presubmit/api.py\", line 229, in _run@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ return self.m.step(name, cmd, **kwargs)@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ File \"RECIPE_REPO[recipe_engine]/recipe_modules/step/api.py\", in __call__@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ return self._run_or_raise_step(@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ ^^^^^^^^^^^^^^^^^^^^^^^^@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ File \"RECIPE_REPO[recipe_engine]/recipe_modules/step/api.py\", in _run_or_raise_step@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ return self._raise_on_disallowed_statuses(ret, allowed_statuses)@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ File \"RECIPE_REPO[recipe_engine]/recipe_modules/step/api.py\", in _raise_on_disallowed_statuses@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@ raise exc('.'.join(result.name_tokens), result)@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@recipe_engine.recipe_api.StepFailure: Step('composite.substep2') (retcode: 1)@@@",
- "@@@STEP_LOG_END@StepFailure(\"Step('composite.substep2') (retcode: 1)\")@@@",
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
"failure": {
"failure": {},
"humanReason": "Step('composite.substep2') (retcode: 1)"
diff --git a/recipes/envtest.expected/fail.json b/recipes/envtest.expected/fail.json
index bb5e0ce..9e0580d 100644
--- a/recipes/envtest.expected/fail.json
+++ b/recipes/envtest.expected/fail.json
@@ -2422,33 +2422,6 @@
]
},
{
- "cmd": [],
- "name": "collect",
- "~followup_annotations": [
- "@@@STEP_TEXT@1 deferred failures@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@Traceback (most recent call last):@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ File \"RECIPE_REPO[recipe_engine]/recipe_modules/defer/api.py\", in __call__@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ return DeferredResult(_api=self.m, _value=func(*args, **kwargs))@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ ^^^^^^^^^^^^^^^^^^^^^@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ File \"RECIPE_REPO[recipe_engine]/recipe_modules/step/api.py\", in __call__@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ return self._run_or_raise_step(@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ ^^^^^^^^^^^^^^^^^^^^^^^^@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ File \"RECIPE_REPO[recipe_engine]/recipe_modules/step/api.py\", in _run_or_raise_step@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ return self._raise_on_disallowed_statuses(ret, allowed_statuses)@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ File \"RECIPE_REPO[recipe_engine]/recipe_modules/step/api.py\", in _raise_on_disallowed_statuses@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@ raise exc('.'.join(result.name_tokens), result)@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@@@@",
- "@@@STEP_LOG_LINE@StepFailure(\"Step('run.sh') (retcode: 1)\")@recipe_engine.recipe_api.StepFailure: Step('run.sh') (retcode: 1)@@@",
- "@@@STEP_LOG_END@StepFailure(\"Step('run.sh') (retcode: 1)\")@@@",
- "@@@STEP_FAILURE@@@"
- ]
- },
- {
"failure": {
"failure": {},
"humanReason": "Step('run.sh') (retcode: 1)"
