summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/test_scheduler.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 76e91cee1..3b59e3e2a 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -3476,12 +3476,7 @@ For CI problems and help debugging, contact ci@example.org"""
# Release jobs in order to avoid races with change A jobs
# finishing before change B jobs.
- self.worker.release('.*-merge')
- self.worker.release('project1-.*')
- self.waitUntilSettled()
- self.worker.release('.*-merge')
- self.worker.release('project1-.*')
- self.waitUntilSettled()
+ self.orderedRelease()
self.worker.hold_jobs_in_build = False
self.worker.release()
self.waitUntilSettled()