Skip to content

Commit

Permalink
Sleep even more
Browse files Browse the repository at this point in the history
  • Loading branch information
slovdahl committed Feb 3, 2025
1 parent ad0ee37 commit 968fa67
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion marge/bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def api(self):
return self._api

def _run(self, repo_manager):
time_to_sleep_between_merges_in_secs = 5
time_to_sleep_between_merges_in_secs = 10
time_to_sleep_when_no_mrs_found_in_secs = 30
while True:
project, merge_request = self._get_assigned_merge_requests()
Expand Down
2 changes: 1 addition & 1 deletion marge/single_merge_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def update_merge_request_and_accept(self, approvals):

if target_project.only_allow_merge_if_pipeline_succeeds:
self.wait_for_ci_to_pass(merge_request, actual_sha)
time.sleep(4)
time.sleep(6)

self.wait_for_merge_status_to_resolve(merge_request)

Expand Down

0 comments on commit 968fa67

Please sign in to comment.