Skip to content

Commit

Permalink
Use ci_timeout for merging (#328)
Browse files Browse the repository at this point in the history
When the bot is waiting for "merge when pipeline suceeds"
the hardcoded 5 minute timeout was applied.

We need to wait for CI to finish in this case,
so setting the merge timeout to CI timeout.
  • Loading branch information
martin-sucha committed May 29, 2023
1 parent 2609791 commit 6fd802c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion marge/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def __init__(self, *, api, user, project, repo, options):
self._project = project
self._repo = repo
self._options = options
self._merge_timeout = timedelta(minutes=5)
self._merge_timeout = options.ci_timeout

@property
def repo(self):
Expand Down

0 comments on commit 6fd802c

Please sign in to comment.