diff --git a/marge/bot.py b/marge/bot.py index e7327808..c2b8ca14 100644 --- a/marge/bot.py +++ b/marge/bot.py @@ -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() diff --git a/marge/single_merge_job.py b/marge/single_merge_job.py index afe91e2b..0450f327 100644 --- a/marge/single_merge_job.py +++ b/marge/single_merge_job.py @@ -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)