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
[SPARK-40727][INFRA] Add merge_spark_docker_pr.py #1
Conversation
if branch == "master": | ||
return versions[0] | ||
else: | ||
branch_ver = branch.replace("branch-", "") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will we have a branch here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, I think only maintain a master branch with all release dockerfiles is enough.
So, only branch == "master" is valid in here, I can remove the fix_version_from_branch I think
And we should also remove L571:
pick_prompt = "Would you like to pick %s into another branch?" % merge_hash
while input("\n%s (y/n): " % pick_prompt).lower() == "y":
merged_refs = merged_refs + [cherry_pick(pr_num, merge_hash, latest_branch)]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this script is almost same as Apache Spark's repo, let's just keep them as are.
If the diff is already large, we could remove these codes out.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it's almost same diff is here: e4107a7. So just let me remove L571 is enough (to remove redundant backport process):
pick_prompt = "Would you like to pick %s into another branch?" % merge_hash
while input("\n%s (y/n): " % pick_prompt).lower() == "y":
merged_refs = merged_refs + [cherry_pick(pr_num, merge_hash, latest_branch)]
This patch has been merged by it self
JIRA https://issues.apache.org/jira/browse/SPARK-40727 was also closed as expected. |
What changes were proposed in this pull request?
This patch add the merge_spark_docker_pr.py to help to merge
spark-docker
commits and resolve spark JIRA issue.The script is from https://github.com/apache/spark/blob/ef837ca71020950b841f9891c70dc4b29d968bf1/dev/merge_spark_pr.py
And change
spark
tospark-docker
: e4107a7Why are the changes needed?
Help to merge spark-docker commits.
Does this PR introduce any user-facing change?
No, dev only
How was this patch tested?
will merge it by using itself