multi_roller: Allow time for child builds to exit
Bug: b/375294207
Change-Id: Id093f161dfbb30f2f7572954b3aa2dac1849d8ba
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/243887
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Danielle Kay <danikay@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
diff --git a/recipes/multi_roller.expected/bypass-presubmit label does not exist.json b/recipes/multi_roller.expected/bypass-presubmit label does not exist.json
index 96cb3a2..3e15a1d 100644
--- a/recipes/multi_roller.expected/bypass-presubmit label does not exist.json
+++ b/recipes/multi_roller.expected/bypass-presubmit label does not exist.json
@@ -437,6 +437,13 @@
]
},
{
+ "cmd": [],
+ "name": "Launching Rollers.sleep 65",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"failure": {
"failure": {},
"humanReason": "Some roller presubmits failed."
diff --git a/recipes/multi_roller.expected/check for presubmit-verified timeout.json b/recipes/multi_roller.expected/check for presubmit-verified timeout.json
index 343b9ac..fd49cb7 100644
--- a/recipes/multi_roller.expected/check for presubmit-verified timeout.json
+++ b/recipes/multi_roller.expected/check for presubmit-verified timeout.json
@@ -438,6 +438,13 @@
]
},
{
+ "cmd": [],
+ "name": "Launching Rollers.sleep 65",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"failure": {
"failure": {},
"humanReason": "Some roller presubmits failed."
diff --git a/recipes/multi_roller.expected/presubmit fails.json b/recipes/multi_roller.expected/presubmit fails.json
index 31c4468..5b2e6e0 100644
--- a/recipes/multi_roller.expected/presubmit fails.json
+++ b/recipes/multi_roller.expected/presubmit fails.json
@@ -440,6 +440,13 @@
]
},
{
+ "cmd": [],
+ "name": "Launching Rollers.sleep 65",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"failure": {
"failure": {},
"humanReason": "Some roller presubmits failed."
diff --git a/recipes/multi_roller.expected/presubmit-verified label does not exist.json b/recipes/multi_roller.expected/presubmit-verified label does not exist.json
index 81c2d2f..49bab16 100644
--- a/recipes/multi_roller.expected/presubmit-verified label does not exist.json
+++ b/recipes/multi_roller.expected/presubmit-verified label does not exist.json
@@ -437,6 +437,13 @@
]
},
{
+ "cmd": [],
+ "name": "Launching Rollers.sleep 65",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"failure": {
"failure": {},
"humanReason": "Some roller presubmits failed."
diff --git a/recipes/multi_roller.expected/roll CL manually abandoned.json b/recipes/multi_roller.expected/roll CL manually abandoned.json
index 0c21d38..0bc16c9 100644
--- a/recipes/multi_roller.expected/roll CL manually abandoned.json
+++ b/recipes/multi_roller.expected/roll CL manually abandoned.json
@@ -439,6 +439,13 @@
]
},
{
+ "cmd": [],
+ "name": "Launching Rollers.sleep 65",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"failure": {
"failure": {},
"humanReason": "Some roller presubmits failed."
diff --git a/recipes/multi_roller.expected/roll CL manually merged.json b/recipes/multi_roller.expected/roll CL manually merged.json
index b8c3912..27361d8 100644
--- a/recipes/multi_roller.expected/roll CL manually merged.json
+++ b/recipes/multi_roller.expected/roll CL manually merged.json
@@ -438,6 +438,13 @@
]
},
{
+ "cmd": [],
+ "name": "Launching Rollers.sleep 65",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipes/multi_roller.expected/success with two sub-rollers.json b/recipes/multi_roller.expected/success with two sub-rollers.json
index 04eb135..92db50b 100644
--- a/recipes/multi_roller.expected/success with two sub-rollers.json
+++ b/recipes/multi_roller.expected/success with two sub-rollers.json
@@ -806,6 +806,13 @@
]
},
{
+ "cmd": [],
+ "name": "Launching Rollers.sleep 65",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@"
+ ]
+ },
+ {
"name": "$result"
}
]
\ No newline at end of file
diff --git a/recipes/multi_roller.py b/recipes/multi_roller.py
index f38caea..7a6cf2b 100644
--- a/recipes/multi_roller.py
+++ b/recipes/multi_roller.py
@@ -133,6 +133,10 @@
if presubmits_passed:
raise
+ # Allow time for child builds to see the labels we've just voted on,
+ # process them, and exit.
+ api.time.sleep(props.poll_interval_secs + 60)
+
# Raise failure if presubmits failed
if not presubmits_passed:
raise api.step.StepFailure("Some roller presubmits failed.")
