feat: enable multiple target branches for batching MRs (#267) #323
Conversation
|
@qqshfox we have used this custom version for a couple of month without any issue. It would be nice to have this merged into the project. |
marge/batch_job.py
Outdated
| @@ -20,19 +20,21 @@ class BatchMergeJob(MergeJob): | |||
| def __init__(self, *, api, user, project, repo, options, merge_requests): | |||
| super().__init__(api=api, user=user, project=project, repo=repo, options=options) | |||
| self._merge_requests = merge_requests | |||
| # In order to run unit tests as standalone, initialize _batch_branch_name | |||
| self._batch_branch_name = BatchMergeJob.BATCH_BRANCH_NAME | |||
There was a problem hiding this comment.
Would you elaborate why this is needed please? Thanks.
There was a problem hiding this comment.
The unit test do expect the fix name of the batch branch. The change does introduce a dynamic name of the batch branch depending on the target branch. Line 24 was a shortcut to have green tests.
Anyhow, I reworked the class. Class methods which do use the name of the batch branch did get an additional parameter (batch_branch_name). IMO this does make the code more readable.
At the same time the initialization of class attribute is not nessary anymore.
@qqshfox would you approve this PR now?
sg70
force-pushed
the
issue-267-enable-multi-branch-for-batching-mrs
branch
8 times, most recently
from
a0e44b7
to
3d8c496
Compare
In order to support batch jobs in parallel, the batch branches need to be tied to the target branch name. Signed-off-by: Sascha Binckly <[email protected]>
sg70
force-pushed
the
issue-267-enable-multi-branch-for-batching-mrs
branch
from
3d8c496
to
d9354ac
Compare
In order to support batch jobs in parallel, the batch branches
need to be tied to the target branch name.
Signed-off-by: Sascha Binckly [email protected]