[auto_submit] Use query to check for unresolved comments
Instead of checking the unresolved comment count after querying changes,
use a Gerrit query parameter to filter out changes with unresolved
ocmments. This simplifies the recipe logic and makes payload sizes
smaller.
Change-Id: I225878ba8f74033e827fefc763f4cb0f460f8e73
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/669648
Fuchsia-Auto-Submit: Oliver Newman <olivernewman@google.com>
Reviewed-by: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
diff --git a/recipe_modules/gerrit_auto_submit/api.py b/recipe_modules/gerrit_auto_submit/api.py
index 8f40738..3cffd57 100644
--- a/recipe_modules/gerrit_auto_submit/api.py
+++ b/recipe_modules/gerrit_auto_submit/api.py
@@ -48,15 +48,22 @@
return "auto-submit" in email
def get_eligible_changes(self):
- raw_query = (
- "is:submittable is:open -is:wip "
- "-(label:Commit-Queue+1 OR label:Commit-Queue+2) "
- "label:{}+1 "
- # Ignore changes that haven't been updated in a while to keep
- # response sizes small. We look back at least a few days to ensure
- # that we can recover missed CLs in case the auto-submit builder
- # breaks for a while.
- "-age:10d"
+ raw_query = " ".join(
+ [
+ "is:submittable",
+ "is:open",
+ "-is:wip",
+ "-(label:Commit-Queue+1 OR label:Commit-Queue+2)",
+ "label:{}+1",
+ # Ignore changes that haven't been updated in a while to keep
+ # response sizes small. We look back at least a few days to ensure
+ # that we can recover missed CLs in case the auto-submit builder
+ # breaks for a while.
+ "-age:10d",
+ # Ignore changes with unresolved comments so that changes don't
+ # get submitted until all reviewer feedback has been addressed.
+ "-has:unresolved",
+ ]
).format(self._auto_submit_label)
changes = self.m.gerrit.change_query(
name="get changes for %s" % self._gerrit_host,
@@ -73,8 +80,6 @@
eligible_changes = []
for change in changes:
- if change["unresolved_comment_count"]:
- continue
change_id = self.m.url.unquote(change["id"])
with self.m.step.nest(
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/changes_submitted_together.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/changes_submitted_together.json
index cbe25cd..ec77bd8 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/changes_submitted_together.json
+++ b/recipe_modules/gerrit_auto_submit/examples/full.expected/changes_submitted_together.json
@@ -135,7 +135,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -157,7 +157,6 @@
"@@@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@ \"unresolved_comment_count\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -167,7 +166,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/dry_run.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/dry_run.json
index 84c9159..8795847 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/dry_run.json
+++ b/recipe_modules/gerrit_auto_submit/examples/full.expected/dry_run.json
@@ -132,7 +132,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -154,7 +154,6 @@
"@@@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@ \"unresolved_comment_count\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -164,7 +163,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/no_changes.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/no_changes.json
index 7042979..e22a877 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/no_changes.json
+++ b/recipe_modules/gerrit_auto_submit/examples/full.expected/no_changes.json
@@ -135,7 +135,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -150,7 +150,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/state_retryable.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/state_retryable.json
index 82fc69c..cd6ccbd 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/state_retryable.json
+++ b/recipe_modules/gerrit_auto_submit/examples/full.expected/state_retryable.json
@@ -135,7 +135,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -157,7 +157,6 @@
"@@@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@ \"unresolved_comment_count\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -167,7 +166,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/state_too_many_attempts.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/state_too_many_attempts.json
index 743abc2..4b42f53 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/state_too_many_attempts.json
+++ b/recipe_modules/gerrit_auto_submit/examples/full.expected/state_too_many_attempts.json
@@ -135,7 +135,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -157,7 +157,6 @@
"@@@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@ \"unresolved_comment_count\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -167,7 +166,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/state_too_many_attempts_comments.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/state_too_many_attempts_comments.json
index 00168ad..8dbaa39 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/state_too_many_attempts_comments.json
+++ b/recipe_modules/gerrit_auto_submit/examples/full.expected/state_too_many_attempts_comments.json
@@ -135,7 +135,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -157,7 +157,6 @@
"@@@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@ \"unresolved_comment_count\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -167,7 +166,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/state_tree_closed.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/state_tree_closed.json
index 54a744e..1a80a64 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/state_tree_closed.json
+++ b/recipe_modules/gerrit_auto_submit/examples/full.expected/state_tree_closed.json
@@ -135,7 +135,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -157,7 +157,6 @@
"@@@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@ \"unresolved_comment_count\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -167,7 +166,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/unmergeable.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/unmergeable.json
index 731b81d..7d75e61 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/unmergeable.json
+++ b/recipe_modules/gerrit_auto_submit/examples/full.expected/unmergeable.json
@@ -132,7 +132,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -154,7 +154,6 @@
"@@@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@ \"unresolved_comment_count\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -164,7 +163,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/unmergeable_nontrivial_merge_conflict.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/unmergeable_nontrivial_merge_conflict.json
index e1d2c06..87bcac2 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/unmergeable_nontrivial_merge_conflict.json
+++ b/recipe_modules/gerrit_auto_submit/examples/full.expected/unmergeable_nontrivial_merge_conflict.json
@@ -135,7 +135,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -157,7 +157,6 @@
"@@@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@ \"unresolved_comment_count\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -167,7 +166,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.expected/unresolved_comments.json b/recipe_modules/gerrit_auto_submit/examples/full.expected/unresolved_comments.json
deleted file mode 100644
index 320338b..0000000
--- a/recipe_modules/gerrit_auto_submit/examples/full.expected/unresolved_comments.json
+++ /dev/null
@@ -1,169 +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",
- "~followup_annotations": [
- "@@@STEP_TEXT@<br/>no eligible changes.@@@"
- ]
- },
- {
- "cmd": [],
- "name": "get eligible.ensure gerrit",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "get eligible.ensure gerrit.read manifest",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"path\": \"path/to/gerrit\",@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@ \"version\": \"version:pinned-version\"@@@",
- "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
- "@@@STEP_LOG_END@tool_manifest.json@@@"
- ]
- },
- {
- "cmd": [],
- "name": "get eligible.ensure gerrit.install path/to/gerrit",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@2@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
- ],
- "infra_step": true,
- "name": "get eligible.ensure gerrit.install path/to/gerrit.ensure package directory",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@3@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
- "-ensure-file",
- "path/to/gerrit version:pinned-version",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "get eligible.ensure gerrit.install path/to/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\": \"path/to/gerrit\"@@@",
- "@@@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/path/to/gerrit/version%3Apinned-version/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 -age:10d\"}}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "get eligible.get changes for fuchsia-review.googlesource.com",
- "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@ \"unresolved_comment_count\": 1, @@@",
- "@@@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 -age:10d\"@@@",
- "@@@STEP_LOG_LINE@json.input@ }@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@"
- ]
- },
- {
- "cmd": [],
- "name": "record state",
- "~followup_annotations": [
- "@@@SET_BUILD_PROPERTY@state@\"{}\"@@@"
- ]
- },
- {
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/recipe_modules/gerrit_auto_submit/examples/full.py b/recipe_modules/gerrit_auto_submit/examples/full.py
index 684e850..11e6085 100644
--- a/recipe_modules/gerrit_auto_submit/examples/full.py
+++ b/recipe_modules/gerrit_auto_submit/examples/full.py
@@ -120,8 +120,3 @@
+ api.gerrit_auto_submit.mergeable_test_data()
+ api.properties(dry_run=True, **properties)
)
-
- yield (
- api.status_check.test("unresolved_comments")
- + api.gerrit_auto_submit.changes_query_test_data(unresolved_comment_count=1)
- )
diff --git a/recipe_modules/gerrit_auto_submit/test_api.py b/recipe_modules/gerrit_auto_submit/test_api.py
index 520fa07..81b4eea 100644
--- a/recipe_modules/gerrit_auto_submit/test_api.py
+++ b/recipe_modules/gerrit_auto_submit/test_api.py
@@ -13,7 +13,7 @@
def cq_success(self):
return self.step_data("cq.3965", self.m.json.output({}), retcode=0)
- def changes_query_test_data(self, unresolved_comment_count=0):
+ def changes_query_test_data(self):
return self.step_data(
"get eligible.get changes for fuchsia-review.googlesource.com",
self.m.json.output(
@@ -29,7 +29,6 @@
"updated": "2013-02-21 11:16:36.775000000",
"_number": 3965,
"owner": {"name": "John Doe"},
- "unresolved_comment_count": unresolved_comment_count,
"current_revision": "27cc4558b5a3d3387dd11ee2df7a117e7e581822",
}
]
diff --git a/recipes/gerrit_auto_submit.expected/default.json b/recipes/gerrit_auto_submit.expected/default.json
index 260c156..bec9f05 100644
--- a/recipes/gerrit_auto_submit.expected/default.json
+++ b/recipes/gerrit_auto_submit.expected/default.json
@@ -132,7 +132,7 @@
"-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 -age:10d\"}}",
+ "{\"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 -age:10d -has:unresolved\"}}",
"-output",
"/path/to/tmp/json"
],
@@ -154,7 +154,6 @@
"@@@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@ \"unresolved_comment_count\": 0, @@@",
"@@@STEP_LOG_LINE@json.output@ \"updated\": \"2013-02-21 11:16:36.775000000\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@]@@@",
@@ -164,7 +163,7 @@
"@@@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 -age:10d\"@@@",
+ "@@@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 -age:10d -has:unresolved\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
