Roll recipe deps
Also update recipe testing to use the new recipe testing options
protobuf.
Change-Id: I02f98d904505508454f4420c538a7745bc9729ba
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/100093
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index d50fc93..5439dc9 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -17,12 +17,12 @@
"deps": {
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "979ef23a8b0266ae729427e0ce2af43939703925",
+ "revision": "e966ec3c4dfcf0c9b8885a349cadf5a032882755",
"url": "https://fuchsia.googlesource.com/infra/recipes"
},
"recipe_engine": {
"branch": "refs/heads/main",
- "revision": "5a7f940c8e17572245e886877b58038135f76409",
+ "revision": "606ae4d1deabddcf3b11c5fbb9791523dea61eeb",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py"
}
},
diff --git a/recipes/recipes.proto b/recipes/recipes.proto
index fced291..d337406 100644
--- a/recipes/recipes.proto
+++ b/recipes/recipes.proto
@@ -16,30 +16,9 @@
package recipes.pigweed.recipes;
+import "recipe_modules/fuchsia/recipe_testing/options.proto";
import "recipe_modules/pigweed/checkout/options.proto";
-message Project {
- // Name of the project, e.g., "pigweed".
- string name = 1;
-
- // Include tryjobs with result_visibility COMMENT_LEVEL_RESTRICTED.
- bool include_restricted = 2;
-
- // Include tryjobs with result_visibility COMMENT_LEVEL_FULL.
- bool include_unrestricted = 3;
-
- // Name of the CQ file. Defaults to "commit-queue.cfg".
- string cq_config_name = 4;
-}
-
-message RecipeTestingOptions {
- // List of projects to use when searching for tryjobs.
- repeated Project projects = 1;
-
- // Launch tryjobs through Buildbucket API instead of led.
- bool use_buildbucket = 2;
-}
-
message InputProperties {
// Exit after unit tests complete.
bool unittest_only = 1;
@@ -53,7 +32,8 @@
// LUCI projects to scan for tryjobs.
repeated string projects = 4;
- RecipeTestingOptions recipe_testing_options = 5;
+ // Recipe Testing module options.
+ recipe_modules.fuchsia.recipe_testing.Options recipe_testing_options = 5;
// Checkout module options.
recipe_modules.pigweed.checkout.Options checkout_options = 6;
diff --git a/recipes/recipes.py b/recipes/recipes.py
index 1446ef2..3fc528f 100644
--- a/recipes/recipes.py
+++ b/recipes/recipes.py
@@ -130,7 +130,7 @@
yield (
api.status_check.test('cq_try')
+ properties(unittest_only=False)
- + api.recipe_testing.config((api.recipe_testing.project('pigweed'),))
+ + api.recipe_testing.options((api.recipe_testing.project('pigweed'),))
+ api.checkout.try_test_data()
+ api.commit_queue.test_data('pigweed', COMMIT_QUEUE_CFG)
+ api.recipe_testing.affected_recipes_data(['none'])
