gerrit_auto_submit: Drop expectations
This functionality is tested sufficiently in Fuchsia, so no assertions
are being added.
Change-Id: Ie9e9192c8393500cc3bf9ebaf1408c01cb7061ab
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/199593
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
diff --git a/recipes/gerrit_auto_submit.expected/default.json b/recipes/gerrit_auto_submit.expected/default.json
deleted file mode 100644
index 84f3b59..0000000
--- a/recipes/gerrit_auto_submit.expected/default.json
+++ /dev/null
@@ -1,309 +0,0 @@
-[
- {
- "cmd": [
- "bb",
- "ls",
- "-host",
- "cr-buildbucket.appspot.com",
- "-json",
- "-nopage",
- "-n",
- "5",
- "-fields",
- "output.properties",
- "-predicate",
- "{\"builder\": {}, \"status\": \"ENDED_MASK\"}"
- ],
- "infra_step": true,
- "name": "fetch previous build state",
- "~followup_annotations": [
- "@@@STEP_LOG_END@raw_io.output_text@@@"
- ]
- },
- {
- "cmd": [],
- "name": "get eligible"
- },
- {
- "cmd": [],
- "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [],
- "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.get packages",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
- "@@@STEP_LOG_END@cipd.ensure@@@"
- ]
- },
- {
- "cmd": [],
- "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "vpython3",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0o777",
- "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
- ],
- "infra_step": true,
- "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
- "-ensure-file",
- "infra/tools/luci/gerrit/${platform} version:pinned-version",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "get eligible.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
- "change-query",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"params\": {\"o\": [\"CURRENT_REVISION\"], \"q\": \"is:submittable is:open -is:wip -(label:Commit-Queue+1 OR label:Commit-Queue+2) (label:Fuchsia-Auto-Submit+1 OR label:Fuchsia-Auto-Submit=ok) -age:10d -has:unresolved\"}}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "get eligible.get changes",
- "timeout": 120.0,
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"_number\": 3965,@@@",
- "@@@STEP_LOG_LINE@json.output@ \"branch\": \"main\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"change_id\": \"I8473b95934b5732ac55d26311a706c9c2bde9939\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"created\": \"2013-02-01 09:59:32.126000000\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"current_revision\": \"27cc4558b5a3d3387dd11ee2df7a117e7e581822\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"id\": \"myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"owner\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"John Doe\"@@@",
- "@@@STEP_LOG_LINE@json.output@ },@@@",
- "@@@STEP_LOG_LINE@json.output@ \"project\": \"myProject\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"status\": \"NEW\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"subject\": \"Revert \\\"Implementing Feature X\\\"\",@@@",
- "@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LOG_LINE@json.input@{@@@",
- "@@@STEP_LOG_LINE@json.input@ \"params\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"o\": [@@@",
- "@@@STEP_LOG_LINE@json.input@ \"CURRENT_REVISION\"@@@",
- "@@@STEP_LOG_LINE@json.input@ ],@@@",
- "@@@STEP_LOG_LINE@json.input@ \"q\": \"is:submittable is:open -is:wip -(label:Commit-Queue+1 OR label:Commit-Queue+2) (label:Fuchsia-Auto-Submit+1 OR label:Fuchsia-Auto-Submit=ok) -age:10d -has:unresolved\"@@@",
- "@@@STEP_LOG_LINE@json.input@ }@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@"
- ]
- },
- {
- "cmd": [],
- "name": "get eligible.get details for 3965",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
- "change-detail",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "get eligible.get details for 3965.get messages",
- "timeout": 120.0,
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"messages\": []@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LOG_LINE@json.input@{@@@",
- "@@@STEP_LOG_LINE@json.input@ \"change_id\": \"myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939\"@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@",
- "@@@STEP_LINK@gerrit link@https://fuchsia-review.googlesource.com/q/myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
- "changes-submitted-together",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939\", \"params\": {\"o\": [\"NON_VISIBLE_CHANGES\"]}}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "get eligible.get details for 3965.find dependent changes",
- "timeout": 120.0,
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"changes\": [],@@@",
- "@@@STEP_LOG_LINE@json.output@ \"non_visible_changes\": 0@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LOG_LINE@json.input@{@@@",
- "@@@STEP_LOG_LINE@json.input@ \"change_id\": \"myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939\",@@@",
- "@@@STEP_LOG_LINE@json.input@ \"params\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"o\": [@@@",
- "@@@STEP_LOG_LINE@json.input@ \"NON_VISIBLE_CHANGES\"@@@",
- "@@@STEP_LOG_LINE@json.input@ ]@@@",
- "@@@STEP_LOG_LINE@json.input@ }@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@",
- "@@@STEP_LINK@gerrit link@https://fuchsia-review.googlesource.com/q/myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939@@@"
- ]
- },
- {
- "cmd": [],
- "name": "cq"
- },
- {
- "cmd": [],
- "name": "cq.3965",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
- "get-mergeable",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939\", \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "cq.3965.get mergeable",
- "timeout": 120.0,
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"mergeable\": true@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LOG_LINE@json.input@{@@@",
- "@@@STEP_LOG_LINE@json.input@ \"change_id\": \"myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939\",@@@",
- "@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@",
- "@@@STEP_LINK@gerrit link@https://fuchsia-review.googlesource.com/q/myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939\", \"input\": {\"labels\": {\"Commit-Queue\": 2}, \"notify\": \"NONE\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "cq.3965.set CQ+2",
- "timeout": 120.0,
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LOG_LINE@json.input@{@@@",
- "@@@STEP_LOG_LINE@json.input@ \"change_id\": \"myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939\",@@@",
- "@@@STEP_LOG_LINE@json.input@ \"input\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"labels\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"Commit-Queue\": 2@@@",
- "@@@STEP_LOG_LINE@json.input@ },@@@",
- "@@@STEP_LOG_LINE@json.input@ \"notify\": \"NONE\"@@@",
- "@@@STEP_LOG_LINE@json.input@ },@@@",
- "@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@",
- "@@@STEP_LINK@gerrit link@https://fuchsia-review.googlesource.com/q/myProject~main~I8473b95934b5732ac55d26311a706c9c2bde9939@@@"
- ]
- },
- {
- "cmd": [],
- "name": "record state",
- "~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@state@\"{\\\"fuchsia-review.googlesource.com\\\": {\\\"27cc4558b5a3d3387dd11ee2df7a117e7e581822\\\": {\\\"attempts\\\": 1, \\\"last_action_time_secs\\\": 1337000003}}}\"@@@"
- ]
- },
- {
- "name": "$result",
- "summaryMarkdown": "fuchsia-review.googlesource.com\n https://fuchsia-review.googlesource.com/c/myProject/+/3965\n"
- }
-]
\ No newline at end of file
diff --git a/recipes/gerrit_auto_submit.py b/recipes/gerrit_auto_submit.py
index 5d74323..5071066 100644
--- a/recipes/gerrit_auto_submit.py
+++ b/recipes/gerrit_auto_submit.py
@@ -14,6 +14,7 @@
"""Recipe for auto-triggering CQ+2 on submittable changes if requested."""
from PB.recipes.pigweed.gerrit_auto_submit import InputProperties
+from recipe_engine import post_process
DEPS = [
'fuchsia/gerrit_auto_submit',
@@ -39,4 +40,5 @@
+ api.gerrit_auto_submit.changes_submitted_together_test_data()
+ api.gerrit_auto_submit.mergeable_test_data()
+ api.gerrit_auto_submit.cq_success()
+ + api.post_process(post_process.DropExpectation)
)
