Revert "[auto_roller] Add a message to the CL when CQ is completed successfully."
This reverts commit 16d501b19f5e3f9a214cf49d83dfc765f33a3bbd.
Reason for revert: commenting is broken
Original change's description:
> [auto_roller] Add a message to the CL when CQ is completed successfully.
>
> Bug: IN-1136 #comment
> Change-Id: I67820771ae1424c99263f0965bbd257b60eb266b
TBR=kjharland@google.com,joshuaseaton@google.com,nmulcahey@google.com,ihuh@google.com
Change-Id: I980a748f7d0da280f424468c0f58c97367f5370b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: IN-1136 #comment
diff --git a/README.recipes.md b/README.recipes.md
index 161cb5d..1d8f110 100644
--- a/README.recipes.md
+++ b/README.recipes.md
@@ -153,7 +153,7 @@
API for writing auto-roller recipes.
-— **def [attempt\_roll](/recipe_modules/auto_roller/api.py#243)(self, gerrit_project, repo_dir, commit_message, commit_untracked=False, dry_run=False, commit_ids=None):**
+— **def [attempt\_roll](/recipe_modules/auto_roller/api.py#231)(self, gerrit_project, repo_dir, commit_message, commit_untracked=False, dry_run=False):**
Attempts to submit local edits via the CQ.
@@ -187,8 +187,6 @@
multiline string (embedded newlines are allowed).
commit_untracked (bool): Whether to commit untracked files as well.
dry_run (bool): Whether to execute this method in dry_run mode.
- commit_ids (list): A list of strings representing the change IDs of all
- the commits included in this roll.
  **@property**<br>— **def [poll\_interval\_secs](/recipe_modules/auto_roller/api.py#38)(self):**
@@ -620,7 +618,7 @@
message (str): A message explaining the reason for abandoning the change.
test_data (recipe_test_api.StepTestData): Test JSON output data for this step.
-— **def [change\_details](/recipe_modules/gerrit/api.py#152)(self, name, change_id, gerrit_host=None, query_params=[], test_data=None):**
+— **def [change\_details](/recipe_modules/gerrit/api.py#149)(self, name, change_id, gerrit_host=None, query_params=[], test_data=None):**
Returns a JSON dict of details regarding a specific change.
@@ -654,7 +652,7 @@
  **@host.setter**<br>— **def [host](/recipe_modules/gerrit/api.py#56)(self, host):**
-— **def [restore\_change](/recipe_modules/gerrit/api.py#178)(self, name, change_id, message=None, test_data=None):**
+— **def [restore\_change](/recipe_modules/gerrit/api.py#175)(self, name, change_id, message=None, test_data=None):**
Restores a change.
@@ -666,7 +664,7 @@
message (str): An optional message explaining the reason for restoring the change.
test_data (recipe_test_api.StepTestData): Test JSON output data for this step.
-— **def [set\_review](/recipe_modules/gerrit/api.py#110)(self, name, change_id, labels=None, message=None, reviewers=None, ccs=None, revision='current', test_data=None):**
+— **def [set\_review](/recipe_modules/gerrit/api.py#110)(self, name, change_id, labels=None, reviewers=None, ccs=None, revision='current', test_data=None):**
Sets a change at a revision for review. Can optionally set labels,
reviewers, and CCs.
@@ -679,7 +677,6 @@
change_id (str): A change ID that uniquely defines a change on the host.
labels (dict): A map of labels (with names as strings, e.g. 'Code-Review') to the
integral values you wish to set them to.
- message (str): A message to be added as a review comment.
reviewers (list): A list of strings containing reviewer IDs (e.g. email addresses).
ccs (list): A list of strings containing reviewer IDs (e.g. email addresses).
revision (str): A revision ID that identifies a revision for the change
diff --git a/recipe_modules/auto_roller/api.py b/recipe_modules/auto_roller/api.py
index 3caa12a..7f9154a 100644
--- a/recipe_modules/auto_roller/api.py
+++ b/recipe_modules/auto_roller/api.py
@@ -228,20 +228,8 @@
return CQResult.TIMEOUT
- def _comment_successful_roll(self, change_ids):
- """Writes a message signifying a successful roll for the given change_ids."""
- message = 'Change has been successfully rolled.'
- with self.m.step.nest('comment successful roll'):
- for change_id in change_ids:
- self.m.gerrit.set_review(
- 'update %s' % change_id,
- change_id,
- message=message,
- test_data=self.m.json.test_api.output({}),
- )
-
def attempt_roll(self, gerrit_project, repo_dir, commit_message, commit_untracked=False,
- dry_run=False, commit_ids=None):
+ dry_run=False):
"""Attempts to submit local edits via the CQ.
It additionally has two modes of operation, dry-run mode and production mode.
@@ -274,8 +262,6 @@
multiline string (embedded newlines are allowed).
commit_untracked (bool): Whether to commit untracked files as well.
dry_run (bool): Whether to execute this method in dry_run mode.
- commit_ids (list): A list of strings representing the change IDs of all
- the commits included in this roll.
"""
self.m.gerrit.ensure_gerrit()
@@ -300,12 +286,9 @@
result = self._wait_for_cq(change_id, dry_run)
# Interpret the result and finish.
- if result == CQResult.SUCCESS:
- if dry_run:
- # Only abandon the roll on success if it was a dry-run.
- self.m.gerrit.abandon('abandon roll: dry run complete', change_id)
- elif commit_ids:
- self._comment_successful_roll(commit_ids)
+ if dry_run and result == CQResult.SUCCESS:
+ # Only abandon the roll on success if it was a dry-run.
+ self.m.gerrit.abandon('abandon roll: dry run complete', change_id)
elif result == CQResult.FAILURE:
self._abandon_change_and_fail(reason='CQ failed', change_id=change_id)
elif result == CQResult.TIMEOUT:
diff --git a/recipe_modules/auto_roller/examples/full.expected/zircon.json b/recipe_modules/auto_roller/examples/full.expected/zircon.json
index 9c5222b..994d38b 100644
--- a/recipe_modules/auto_roller/examples/full.expected/zircon.json
+++ b/recipe_modules/auto_roller/examples/full.expected/zircon.json
@@ -353,46 +353,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"123456789\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 123456789",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"987654321\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 987654321",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipe_modules/auto_roller/examples/full.expected/zircon_default.json b/recipe_modules/auto_roller/examples/full.expected/zircon_default.json
index 9c5222b..994d38b 100644
--- a/recipe_modules/auto_roller/examples/full.expected/zircon_default.json
+++ b/recipe_modules/auto_roller/examples/full.expected/zircon_default.json
@@ -353,46 +353,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"123456789\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 123456789",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"987654321\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 987654321",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipe_modules/auto_roller/examples/full.expected/zircon_existing_roll.json b/recipe_modules/auto_roller/examples/full.expected/zircon_existing_roll.json
index 97f665d..e5193e3 100644
--- a/recipe_modules/auto_roller/examples/full.expected/zircon_existing_roll.json
+++ b/recipe_modules/auto_roller/examples/full.expected/zircon_existing_roll.json
@@ -374,46 +374,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"123456789\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 123456789",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"987654321\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 987654321",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipe_modules/auto_roller/examples/full.expected/zircon_integral_poll_secs.json b/recipe_modules/auto_roller/examples/full.expected/zircon_integral_poll_secs.json
index 9c5222b..994d38b 100644
--- a/recipe_modules/auto_roller/examples/full.expected/zircon_integral_poll_secs.json
+++ b/recipe_modules/auto_roller/examples/full.expected/zircon_integral_poll_secs.json
@@ -353,46 +353,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"123456789\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 123456789",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"987654321\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 987654321",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipe_modules/auto_roller/examples/full.expected/zircon_untracked.json b/recipe_modules/auto_roller/examples/full.expected/zircon_untracked.json
index eb79e04..d6b4827 100644
--- a/recipe_modules/auto_roller/examples/full.expected/zircon_untracked.json
+++ b/recipe_modules/auto_roller/examples/full.expected/zircon_untracked.json
@@ -364,46 +364,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"123456789\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 123456789",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"987654321\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "comment successful roll.update 987654321",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipe_modules/auto_roller/examples/full.py b/recipe_modules/auto_roller/examples/full.py
index 2259706..f2822fa 100644
--- a/recipe_modules/auto_roller/examples/full.py
+++ b/recipe_modules/auto_roller/examples/full.py
@@ -42,7 +42,6 @@
commit_message='hello world!',
commit_untracked=commit_untracked_files,
dry_run=dry_run,
- commit_ids=['123456789', '987654321'],
)
diff --git a/recipe_modules/gerrit/api.py b/recipe_modules/gerrit/api.py
index ad01419..2769e1e 100644
--- a/recipe_modules/gerrit/api.py
+++ b/recipe_modules/gerrit/api.py
@@ -107,8 +107,8 @@
test_data=test_data,
)
- def set_review(self, name, change_id, labels=None, message=None,
- reviewers=None, ccs=None, revision='current', test_data=None):
+ def set_review(self, name, change_id, labels=None, reviewers=None,
+ ccs=None, revision='current', test_data=None):
"""Sets a change at a revision for review. Can optionally set labels,
reviewers, and CCs.
@@ -120,7 +120,6 @@
change_id (str): A change ID that uniquely defines a change on the host.
labels (dict): A map of labels (with names as strings, e.g. 'Code-Review') to the
integral values you wish to set them to.
- message (str): A message to be added as a review comment.
reviewers (list): A list of strings containing reviewer IDs (e.g. email addresses).
ccs (list): A list of strings containing reviewer IDs (e.g. email addresses).
revision (str): A revision ID that identifies a revision for the change
@@ -134,8 +133,6 @@
}
if labels:
input_json['input']['labels'] = labels
- if message:
- input_json['input']['message'] = message
if reviewers or ccs:
input_json['input']['reviewers'] = []
if reviewers:
@@ -194,4 +191,4 @@
subcmd='restore',
input_json=input_json,
test_data=test_data,
- )
+ )
\ No newline at end of file
diff --git a/recipe_modules/gerrit/examples/full.expected/basic.json b/recipe_modules/gerrit/examples/full.expected/basic.json
index 66315d9..6017137 100644
--- a/recipe_modules/gerrit/examples/full.expected/basic.json
+++ b/recipe_modules/gerrit/examples/full.expected/basic.json
@@ -111,7 +111,7 @@
"-host",
"https://fuchsia-review.googlesource.com",
"-input",
- "{\"change_id\": \"some id\", \"input\": {\"labels\": {\"Code-Review\": -1}, \"message\": \"set review\", \"reviewers\": [{\"reviewer\": \"test@example.com\"}, {\"reviewer\": \"test2@example.com\", \"state\": \"CC\"}]}, \"revision_id\": \"current\"}",
+ "{\"change_id\": \"some id\", \"input\": {\"labels\": {\"Code-Review\": -1}, \"reviewers\": [{\"reviewer\": \"test@example.com\"}, {\"reviewer\": \"test2@example.com\", \"state\": \"CC\"}]}, \"revision_id\": \"current\"}",
"-output",
"/path/to/tmp/json"
],
diff --git a/recipe_modules/gerrit/examples/full.py b/recipe_modules/gerrit/examples/full.py
index fe32c8c..89ade30 100644
--- a/recipe_modules/gerrit/examples/full.py
+++ b/recipe_modules/gerrit/examples/full.py
@@ -47,7 +47,6 @@
'-1',
change_id,
labels = {'Code-Review': -1},
- message = 'set review',
reviewers = ['test@example.com'],
ccs = ['test2@example.com'],
)
diff --git a/recipes/fuchsia_roller.expected/cobalt_project.json b/recipes/fuchsia_roller.expected/cobalt_project.json
index cb96072..57f9928 100644
--- a/recipes/fuchsia_roller.expected/cobalt_project.json
+++ b/recipes/fuchsia_roller.expected/cobalt_project.json
@@ -455,67 +455,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3e30158f2a7caccb7a9f6632a60011e7a44e1e5c\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3e30158f2a7caccb7a9f6632a60011e7a44e1e5c",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3380b83c11e029b7291c83c44e7b1ce09d465fd1\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3380b83c11e029b7291c83c44e7b1ce09d465fd1",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"363caa907186de786cb5292cd1ab7245da954815\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 363caa907186de786cb5292cd1ab7245da954815",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipes/fuchsia_roller.expected/garnet.json b/recipes/fuchsia_roller.expected/garnet.json
index 8485a81..50193a7 100644
--- a/recipes/fuchsia_roller.expected/garnet.json
+++ b/recipes/fuchsia_roller.expected/garnet.json
@@ -454,67 +454,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3e30158f2a7caccb7a9f6632a60011e7a44e1e5c\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3e30158f2a7caccb7a9f6632a60011e7a44e1e5c",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3380b83c11e029b7291c83c44e7b1ce09d465fd1\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3380b83c11e029b7291c83c44e7b1ce09d465fd1",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"363caa907186de786cb5292cd1ab7245da954815\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 363caa907186de786cb5292cd1ab7245da954815",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipes/fuchsia_roller.expected/missing_revision.json b/recipes/fuchsia_roller.expected/missing_revision.json
index a8cd3a5..0771264 100644
--- a/recipes/fuchsia_roller.expected/missing_revision.json
+++ b/recipes/fuchsia_roller.expected/missing_revision.json
@@ -473,67 +473,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3e30158f2a7caccb7a9f6632a60011e7a44e1e5c\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3e30158f2a7caccb7a9f6632a60011e7a44e1e5c",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3380b83c11e029b7291c83c44e7b1ce09d465fd1\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3380b83c11e029b7291c83c44e7b1ce09d465fd1",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"363caa907186de786cb5292cd1ab7245da954815\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 363caa907186de786cb5292cd1ab7245da954815",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipes/fuchsia_roller.expected/peridot.json b/recipes/fuchsia_roller.expected/peridot.json
index ec1be7f..0b9bf8d 100644
--- a/recipes/fuchsia_roller.expected/peridot.json
+++ b/recipes/fuchsia_roller.expected/peridot.json
@@ -454,67 +454,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3e30158f2a7caccb7a9f6632a60011e7a44e1e5c\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3e30158f2a7caccb7a9f6632a60011e7a44e1e5c",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3380b83c11e029b7291c83c44e7b1ce09d465fd1\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3380b83c11e029b7291c83c44e7b1ce09d465fd1",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"363caa907186de786cb5292cd1ab7245da954815\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 363caa907186de786cb5292cd1ab7245da954815",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipes/fuchsia_roller.expected/peridot_with_lockfile.json b/recipes/fuchsia_roller.expected/peridot_with_lockfile.json
index ea624a9..bc240f2 100644
--- a/recipes/fuchsia_roller.expected/peridot_with_lockfile.json
+++ b/recipes/fuchsia_roller.expected/peridot_with_lockfile.json
@@ -473,67 +473,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3e30158f2a7caccb7a9f6632a60011e7a44e1e5c\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3e30158f2a7caccb7a9f6632a60011e7a44e1e5c",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3380b83c11e029b7291c83c44e7b1ce09d465fd1\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3380b83c11e029b7291c83c44e7b1ce09d465fd1",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"363caa907186de786cb5292cd1ab7245da954815\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 363caa907186de786cb5292cd1ab7245da954815",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipes/fuchsia_roller.expected/roll_from_non_https_remote.json b/recipes/fuchsia_roller.expected/roll_from_non_https_remote.json
index eea5652..b3a4bb3 100644
--- a/recipes/fuchsia_roller.expected/roll_from_non_https_remote.json
+++ b/recipes/fuchsia_roller.expected/roll_from_non_https_remote.json
@@ -454,67 +454,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3e30158f2a7caccb7a9f6632a60011e7a44e1e5c\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3e30158f2a7caccb7a9f6632a60011e7a44e1e5c",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3380b83c11e029b7291c83c44e7b1ce09d465fd1\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3380b83c11e029b7291c83c44e7b1ce09d465fd1",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"363caa907186de786cb5292cd1ab7245da954815\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 363caa907186de786cb5292cd1ab7245da954815",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipes/fuchsia_roller.expected/zircon.json b/recipes/fuchsia_roller.expected/zircon.json
index ff4e9a4..3b88048 100644
--- a/recipes/fuchsia_roller.expected/zircon.json
+++ b/recipes/fuchsia_roller.expected/zircon.json
@@ -454,67 +454,6 @@
]
},
{
- "cmd": [],
- "name": "comment successful roll"
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3e30158f2a7caccb7a9f6632a60011e7a44e1e5c\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3e30158f2a7caccb7a9f6632a60011e7a44e1e5c",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"3380b83c11e029b7291c83c44e7b1ce09d465fd1\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 3380b83c11e029b7291c83c44e7b1ce09d465fd1",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/gerrit/gerrit",
- "set-review",
- "-host",
- "https://fuchsia-review.googlesource.com",
- "-input",
- "{\"change_id\": \"363caa907186de786cb5292cd1ab7245da954815\", \"input\": {\"message\": \"Change has been successfully rolled.\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "comment successful roll.update 363caa907186de786cb5292cd1ab7245da954815",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"jsonResult": null,
"name": "$result"
}
diff --git a/recipes/fuchsia_roller.py b/recipes/fuchsia_roller.py
index 13bdf4f..3b1fad6 100644
--- a/recipes/fuchsia_roller.py
+++ b/recipes/fuchsia_roller.py
@@ -176,7 +176,6 @@
repo_dir=project_dir,
commit_message=message,
dry_run=dry_run,
- commit_ids=[commit['id'] for commit in log]
)
