Skip to content
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.

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

[Backport 2023.1] feature(auto-backport.py): replace Mergify #9729

Merged
merged 2 commits into from
Jan 11, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 8, 2025

Adding an auto-backport.py script to handle backport automation instead of Mergify.

The rules of backport are as follows:

  • Merged PR with any backport/x.y label (one or more) and promoted-to-master label
  • Backport PR will be automatically assigned to the original PR author
  • All PRs will be open under the scylladbbot account - which will allow write access in case of conflicts
  • PR with conflicts will open in draft mode.
  • Fixing cherry-pick the wrong commit SHA. With the new script, we always take the SHA from the stable branch

Since the SCT repo is public and GitHub doesn't clone permissions to the public repo (for forks),
For the first time only, each PR owner will receive an email
with an invite to the scylladbbot/scylla-cluster-tests fork

(cherry picked from commit 2f132a8 )

Parent PR: #9697

Adding an auto-backport.py script to handle backport automation instead of Mergify.

The rules of backport are as follows:
* Merged PR with any backport/x.y label (one or more) and promoted-to-master label
* Backport PR will be automatically assigned to the original PR author
* All PRs will be open under the `scylladbbot` account - which will allow write access in case of conflicts
* PR with conflicts will open in draft mode.
* Fixing cherry-pick the wrong commit SHA. With the new script, we always take the SHA from the stable branch

**Since the SCT repo is public and GitHub doesn't clone permissions to the public repo (for forks),
for the first time only, each PR owner will receive an email,
with an invite to the `scylladbbot/scylla-cluster-tests` fork**

(cherry picked from commit 2f132a8)

# Conflicts:
#	.github/scripts/search_commits.py
#	.github/workflows/add-label-when-promoted.yaml
Copy link
Author

mergify bot commented Jan 8, 2025

Cherry-pick of 2f132a8 has failed:

On branch mergify/bp/branch-2023.1/pr-9697
Your branch is up to date with 'origin/branch-2023.1'.

You are currently cherry-picking commit 2f132a86.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .github/scripts/auto-backport.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/scripts/search_commits.py
	deleted by us:   .github/workflows/add-label-when-promoted.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot marked this pull request as draft January 8, 2025 20:32
@yaronkaikov yaronkaikov requested a review from fruch January 9, 2025 09:33
@yaronkaikov yaronkaikov marked this pull request as ready for review January 9, 2025 09:33
@yaronkaikov yaronkaikov marked this pull request as draft January 9, 2025 09:35
@yaronkaikov yaronkaikov marked this pull request as ready for review January 9, 2025 09:35
@fruch fruch merged commit 5ae0c5d into branch-2023.1 Jan 11, 2025
4 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants