This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/spark-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new d7734bb [SPARK-48528] Refine K8s Operator `merge_spark_pr.py` to use
`kubernetes-operator-x.y.z` version
d7734bb is described below
commit d7734bbc4413163cf60fe67e23c541929a9a37a8
Author: Dongjoon Hyun <dh...@apple.com>
AuthorDate: Tue Jun 4 12:04:21 2024 -0700
[SPARK-48528] Refine K8s Operator `merge_spark_pr.py` to use
`kubernetes-operator-x.y.z` version
### What changes were proposed in this pull request?
This PR aims to refine `merge_spark_pr.py` to use
`kubernetes-operator-x.y.z` versions.
### Why are the changes needed?
Previously, it uses Apache Spark's versions like 4.0.0.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
I manually tested like the following by printing the versions.
```
Enter number of user, or userid, to assign to (blank to leave unassigned):0
[<JIRA Version: name='kubernetes-operator-0.1.0', id='12354567'>]
```
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #14 from dongjoon-hyun/SPARK-48528.
Lead-authored-by: Dongjoon Hyun <dh...@apple.com>
Co-authored-by: Dongjoon Hyun <dongj...@apache.org>
Signed-off-by: Dongjoon Hyun <dongj...@apache.org>
---
dev/merge_spark_pr.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 24e956d..9a8d39f 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -305,7 +305,9 @@ def resolve_jira_issue(merge_branches, comment,
default_jira_id=""):
versions = [
x
for x in versions
- if not x.raw["released"] and not x.raw["archived"] and
re.match(r"\d+\.\d+\.\d+", x.name)
+ if not x.raw["released"]
+ and not x.raw["archived"]
+ and re.match(r"kubernetes-operator-\d+\.\d+\.\d+", x.name)
]
versions = sorted(versions, key=lambda x: x.name, reverse=True)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
