[feature](ci) Add batch cherry-pick admission (Mergify-like batch mode) - #65181
Draft
morningman wants to merge 1 commit into
Draft
[feature](ci) Add batch cherry-pick admission (Mergify-like batch mode)#65181morningman wants to merge 1 commit into
morningman wants to merge 1 commit into
Conversation
Stack multiple approved PRs targeting a release branch onto one integration branch, run the TeamCity pipeline ONCE, and on green admit + merge the whole batch. Reduces per-PR CI resource usage for bulk master -> branch-4.0/4.1 cherry-picks. Operators drive it from a per-branch tracking Issue (label batch-queue/<branch>) via comments: run batch [#a #b] / rerun batch / cancel batch. A cron poller detects completion, broadcasts admission commit-statuses onto each member PR's head SHA (reusing skip_build's mechanism) and merges members individually so each keeps its own Merged provenance. Single-batch-in-flight per branch, with live-state reconciliation at merge time (skip already-merged/changed/conflicting members). No auto-bisection: failures are handled by the operator. Reuses teamcity-utils.sh (trigger_or_skip_build / context maps) so all TeamCity URLs, credentials and pipeline mappings stay in one place. Files: - .github/workflows/batch-cherry-pick.yml entry (issue_comment + schedule) - tools/batch-cherry-pick.py orchestrator - regression-test/pipeline/common/batch-utils.sh thin reuse of teamcity-utils.sh - tools/batch-cherry-pick.README.md Chinese user + maintainer guide Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stack multiple approved PRs targeting a release branch onto one integration branch, run the TeamCity pipeline ONCE, and on green admit + merge the whole batch. Reduces per-PR CI resource usage for bulk master -> branch-4.0/4.1 cherry-picks.
Operators drive it from a per-branch tracking Issue (label batch-queue/) via comments: run batch [#a #b] / rerun batch / cancel batch. A cron poller detects completion, broadcasts admission commit-statuses onto each member PR's head SHA (reusing skip_build's mechanism) and merges members individually so each keeps its own Merged provenance. Single-batch-in-flight per branch, with live-state reconciliation at merge time (skip already-merged/changed/conflicting members). No auto-bisection: failures are handled by the operator.
Reuses teamcity-utils.sh (trigger_or_skip_build / context maps) so all TeamCity URLs, credentials and pipeline mappings stay in one place.
Files: