roll_util: Don't add "CQ-Do-Not-Cancel-Tryjobs"
Don't add "CQ-Do-Not-Cancel-Tryjobs: true" to rolls. It's now added
automatically by the auto_roller module.
Change-Id: Ic1140868f1883459f367129fd9d9b266fc2061f7
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/36340
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>
diff --git a/recipe_modules/roll_util/api.py b/recipe_modules/roll_util/api.py
index 48b3dd7..76d7667 100644
--- a/recipe_modules/roll_util/api.py
+++ b/recipe_modules/roll_util/api.py
@@ -200,7 +200,7 @@
super(RollUtilApi, self).__init__(*args, **kwargs)
self.labels_to_set = {x.label: x.value for x in props.labels_to_set}
self.labels_to_wait_on = props.labels_to_wait_on
- self.footer = ['CQ-Do-Not-Cancel-Tryjobs: true']
+ self.footer = []
def _single_commit_roll_message(self, roll):
template = """
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
index 2be16b3..071245f 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/mixed.json
@@ -47,7 +47,6 @@
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@abc Rolled-Commits: 111111111111111..444444444444444@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
@@ -95,7 +94,6 @@
"@@@STEP_LOG_LINE@message@888888888888888 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@def Rolled-Commits: 555555555555555..888888888888888@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
@@ -144,7 +142,6 @@
"@@@STEP_LOG_LINE@message@ccccccccccccccc module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
@@ -178,7 +175,6 @@
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
"@@@STEP_LOG_LINE@message@@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
index 14a5580..f2c0829 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/multiple_commits.json
@@ -48,7 +48,6 @@
"@@@STEP_LOG_LINE@message@444444444444444 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@abc Rolled-Commits: 111111111111111..444444444444444@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
@@ -97,7 +96,6 @@
"@@@STEP_LOG_LINE@message@888888888888888 module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@def Rolled-Commits: 555555555555555..888888888888888@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
@@ -146,7 +144,6 @@
"@@@STEP_LOG_LINE@message@ccccccccccccccc module: Short commit summary@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
@@ -180,7 +177,6 @@
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
"@@@STEP_LOG_LINE@message@@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
diff --git a/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json b/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
index 1326beb..e0594ec 100644
--- a/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
+++ b/recipe_modules/roll_util/tests/multiple_rolls.expected/single_commits.json
@@ -47,7 +47,6 @@
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/44444@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@abc Rolled-Commits: 111111111111111..444444444444444@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
@@ -95,7 +94,6 @@
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/88888@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@def Rolled-Commits: 555555555555555..888888888888888@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
@@ -143,7 +141,6 @@
"@@@STEP_LOG_LINE@message@Reviewed-On: https://pigweed-review.googlesource.com/c/project/+/ccccc@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
@@ -180,7 +177,6 @@
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@xyz Rolled-Commits: 999999999999999..ccccccccccccccc@@@",
"@@@STEP_LOG_LINE@message@@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json b/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
index a9186af..5d44588 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/frombranch.json
@@ -128,7 +128,6 @@
"@@@STEP_LOG_LINE@message@...@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: main..555555555555555@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json b/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
index 8b1eaee..e40ceb4 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/multicommit.json
@@ -126,7 +126,6 @@
"@@@STEP_LOG_LINE@message@111111111111111 foo@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: 000000000000000..444444444444444@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/rebase.json b/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
index 69418d8..e17155e 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/rebase.json
@@ -127,7 +127,6 @@
"@@@STEP_LOG_LINE@message@111111111111111 one@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: 000000000000000..555555555555555@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
index 29eab18..31c588b 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_multiline.json
@@ -123,7 +123,6 @@
"@@@STEP_LOG_LINE@message@Original-Bug: 123@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: 000000000000000..111111111111111@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
diff --git a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
index 7d71feb..0847f88 100644
--- a/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
+++ b/recipe_modules/roll_util/tests/single_roll.expected/singlecommit_singleline.json
@@ -121,7 +121,6 @@
"@@@STEP_LOG_LINE@message@bar@@@",
"@@@STEP_LOG_LINE@message@@@@",
"@@@STEP_LOG_LINE@message@proj Rolled-Commits: 000000000000000..111111111111111@@@",
- "@@@STEP_LOG_LINE@message@CQ-Do-Not-Cancel-Tryjobs: true@@@",
"@@@STEP_LOG_END@message@@@"
]
},
