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

[SPARK-44802][INFRA][FOLLOWUP] Fix to consider JIRA_ACCESS_TOKEN in precheck conditions #42502

Closed
wants to merge 5 commits into from

Conversation

dongjoon-hyun
Copy link
Member

@dongjoon-hyun dongjoon-hyun commented Aug 15, 2023

What changes were proposed in this pull request?

This is a follow-up of #42484 to fix the recheck conditions.

Why are the changes needed?

  1. Currently, the merge script fails at the last update stage because the rest of code requires JIRA_USERNAME and JIRA_PASSWORD still.
Would you like to pick afe18868 into another branch? (y/n): n
JIRA_USERNAME and JIRA_PASSWORD not set
Exiting without trying to close the associated JIRA.
  1. In addition, it shows improper warning at the initial stage.
$ dev/merge_spark_pr.py
git rev-parse --abbrev-ref HEAD

The env-vars JIRA_USERNAME and/or JIRA_PASSWORD are not set. Continue? (y/n): y
Which pull request would you like to merge? (e.g. 34):

Does this PR introduce any user-facing change?

No.

How was this patch tested?

Manual tests

Copy link
Member

@yaooqinn yaooqinn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I found this issue and prepared to make a followup too

dev/merge_spark_pr.py Outdated Show resolved Hide resolved
@yaooqinn
Copy link
Member

yaooqinn commented Aug 16, 2023

Let's also update L611 with something like Neither JIRA_ACCESS_TOKEN nor JIRA_USERNAME/JIRA_PASSWORD are set

@dongjoon-hyun
Copy link
Member Author

Thank you, @yaooqinn .

dongjoon-hyun and others added 2 commits August 16, 2023 02:35
Co-authored-by: Kent Yao <yao@apache.org>
@dongjoon-hyun
Copy link
Member Author

I addressed the comments. Thank you again, @yaooqinn .

Copy link
Member

@yaooqinn yaooqinn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yaooqinn
Copy link
Member

Successfully merged PR #42511 and resolved the correlated JIRA issue w/these updates and w/o USER/PASSWORD.

Thanks @dongjoon-hyun for the quick fix. Merged to master

@yaooqinn yaooqinn closed this in 86a04f4 Aug 16, 2023
@dongjoon-hyun
Copy link
Member Author

Thank you so much, @yaooqinn . :)

@dongjoon-hyun dongjoon-hyun deleted the SPARK-44802 branch August 16, 2023 15:40
Copy link
Member

@HyukjinKwon HyukjinKwon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

valentinp17 pushed a commit to valentinp17/spark that referenced this pull request Aug 24, 2023
…recheck conditions

### What changes were proposed in this pull request?

This is a follow-up of apache#42484 to fix the recheck conditions.

### Why are the changes needed?

1. Currently, the merge script fails at the last update stage because the rest of code requires JIRA_USERNAME **and** JIRA_PASSWORD still.
```
Would you like to pick afe1886 into another branch? (y/n): n
JIRA_USERNAME and JIRA_PASSWORD not set
Exiting without trying to close the associated JIRA.
```

2. In addition, it shows improper warning at the initial stage.
```
$ dev/merge_spark_pr.py
git rev-parse --abbrev-ref HEAD

The env-vars JIRA_USERNAME and/or JIRA_PASSWORD are not set. Continue? (y/n): y
Which pull request would you like to merge? (e.g. 34):
```

### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?

Manual tests

Closes apache#42502 from dongjoon-hyun/SPARK-44802.

Authored-by: Dongjoon Hyun <dongjoon@apache.org>
Signed-off-by: Kent Yao <yao@apache.org>
ragnarok56 pushed a commit to ragnarok56/spark that referenced this pull request Mar 2, 2024
…recheck conditions

### What changes were proposed in this pull request?

This is a follow-up of apache#42484 to fix the recheck conditions.

### Why are the changes needed?

1. Currently, the merge script fails at the last update stage because the rest of code requires JIRA_USERNAME **and** JIRA_PASSWORD still.
```
Would you like to pick afe1886 into another branch? (y/n): n
JIRA_USERNAME and JIRA_PASSWORD not set
Exiting without trying to close the associated JIRA.
```

2. In addition, it shows improper warning at the initial stage.
```
$ dev/merge_spark_pr.py
git rev-parse --abbrev-ref HEAD

The env-vars JIRA_USERNAME and/or JIRA_PASSWORD are not set. Continue? (y/n): y
Which pull request would you like to merge? (e.g. 34):
```

### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?

Manual tests

Closes apache#42502 from dongjoon-hyun/SPARK-44802.

Authored-by: Dongjoon Hyun <dongjoon@apache.org>
Signed-off-by: Kent Yao <yao@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants