Skip to content

Allow merging when ready, regardless of predefined order #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow merging when ready, regardless of predefined order #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions marge/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,16 @@ def regexp(str_regex):
action='store_true',
help='Skip CI when updating individual MRs when using batches'
)
parser.add_argument(
'--ci-timeout-skip',
action='store_true',
help='Skip to next MR if CI timeout expires (otherwise, give up on MR)'
)
parser.add_argument(
'--skip-pending',
action='store_true',
help='Skip to next MR if oldest MR is not ready (otherwise, wait until it is)'
)
config = parser.parse_args(args)

if config.use_merge_strategy and config.batch:
Expand Down Expand Up @@ -321,12 +331,14 @@ def main(args=None):
approval_timeout=options.approval_reset_timeout,
embargo=options.embargo,
ci_timeout=options.ci_timeout,
ci_timeout_skip=options.ci_timeout_skip,
fusion=fusion,
use_no_ff_batches=options.use_no_ff_batches,
use_merge_commit_batches=options.use_merge_commit_batches,
skip_ci_batches=options.skip_ci_batches,
),
batch=options.batch,
skip_pending=options.skip_pending,
)

marge_bot = bot.Bot(api=api, config=config)
Expand Down
25 changes: 17 additions & 8 deletions marge/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,22 @@ def _process_merge_requests(self, repo_manager, project, merge_requests):
return
except git.GitError as err:
log.exception('BatchMergeJob failed: %s', err)
log.info('Attempting to merge the oldest MR...')
merge_request = merge_requests[0]
merge_job = self._get_single_job(
project=project, merge_request=merge_request, repo=repo,
options=self._config.merge_opts,
)
merge_job.execute()
elif not self._config.skip_pending:
log.info('Attempting to merge the oldest MR...')
merge_request = merge_requests[0]
merge_job = self._get_single_job(
project=project, merge_request=merge_request, repo=repo,
options=self._config.merge_opts,
)
merge_job.execute()
else:
for i, merge_request in enumerate(merge_requests):
log.info('Attempting to merge MR #%d / %d of assigned MRs...', i + 1, len(merge_requests))
Copy link

@okainov okainov Mar 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use enumerate(merge_requests, start=1) instead of using i+1? :)

merge_job = self._get_single_job(
project=project, merge_request=merge_request,
repo=repo, options=self._config.merge_opts
)
merge_job.execute()

def _get_single_job(self, project, merge_request, repo, options):
return single_merge_job.SingleMergeJob(
Expand All @@ -187,7 +196,7 @@ def _get_single_job(self, project, merge_request, repo, options):

class BotConfig(namedtuple('BotConfig',
'user ssh_key_file project_regexp merge_order merge_opts git_timeout ' +
'git_reference_repo branch_regexp source_branch_regexp batch')):
'git_reference_repo branch_regexp source_branch_regexp batch skip_pending')):
pass


Expand Down
8 changes: 7 additions & 1 deletion marge/job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,10 @@ def wait_for_ci_to_pass(self, merge_request, commit_sha=None):
log.debug('Waiting for %s secs before polling CI status again', waiting_time_in_secs)
time.sleep(waiting_time_in_secs)

raise CannotMerge('CI is taking too long.')
if self._options.ci_timeout_skip:
raise SkipMerge('CI is taking too long.')
else:
raise CannotMerge('CI is taking too long.')

def wait_for_merge_status_to_resolve(self, merge_request):
"""
Expand Down Expand Up @@ -452,6 +455,7 @@ class Fusion(enum.Enum):
'use_no_ff_batches',
'use_merge_commit_batches',
'skip_ci_batches',
'ci_timeout_skip',
]


Expand All @@ -468,6 +472,7 @@ def default(
add_tested=False, add_part_of=False, add_reviewers=False, reapprove=False,
approval_timeout=None, embargo=None, ci_timeout=None, fusion=Fusion.rebase,
use_no_ff_batches=False, use_merge_commit_batches=False, skip_ci_batches=False,
ci_timeout_skip=False,
):
approval_timeout = approval_timeout or timedelta(seconds=0)
embargo = embargo or IntervalUnion.empty()
Expand All @@ -480,6 +485,7 @@ def default(
approval_timeout=approval_timeout,
embargo=embargo,
ci_timeout=ci_timeout,
ci_timeout_skip=ci_timeout_skip,
fusion=fusion,
use_no_ff_batches=use_no_ff_batches,
use_merge_commit_batches=use_merge_commit_batches,
Expand Down