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

Ignore PRs with label kind/cherry-pick when --all is used #5163

Merged
merged 1 commit into from
Jun 28, 2023

Conversation

luolanzone
Copy link
Contributor

These PRs start with "Automated cherry pick of" are already included by default with original PRs. They should be ignored when --all is passed.

These PRs start with "Automated cherry pick of" are already included
by default with original PRs. They should be ignored when `--all` is passed.

Signed-off-by: Lan Luo <luola@vmware.com>
@luolanzone luolanzone requested a review from tnqn June 21, 2023 04:31
@tnqn
Copy link
Member

tnqn commented Jun 21, 2023

These PRs start with "Automated cherry pick of" are already included by default with original PRs. They should be ignored when --all is passed.

I didn't get it. In which situation a cherry-pick PR and its original PR could be in the same release?

@luolanzone
Copy link
Contributor Author

Hi @tnqn , I got below data locally when I tried to run ./hack/release/prepare-changelog.sh --release 1.12.1 --all. I didn't recall that these PRs started with Automated cherry pick were included before. Not sure if there is a github API change.

### Changed

- [ci][flexible-ipam] Use k8s 1.27.2 and containerd for e2e. ([#5116](https://github.com/antrea-io/antrea/pull/5116), [@gran-vmv])
- Fix incorrect FlowMod message passing in openflow client modifyFlows. ([#5125](https://github.com/antrea-io/antrea/pull/5125), [@Dyanngg])
- Fix Egress IP not advertised in some cases . ([#5127](https://github.com/antrea-io/antrea/pull/5127), [@tnqn])
...
...
### Unlabelled (Remove this section eventually)

- Fix ClickHouse service not found in FA e2e test. ([#5148](https://github.com/antrea-io/antrea/pull/5148), [@wsquan171])
- Automated cherry pick of #5116: Use k8s 1.27.2 and containerd for e2e. ([#5151](https://github.com/antrea-io/antrea/pull/5151), [@luolanzone])
- Automated cherry pick of #5125: Fix incorrect FlowMod message passing in openflow client. ([#5145](https://github.com/antrea-io/antrea/pull/5145), [@luolanzone])
- Automated cherry pick of #5127: Fix Egress IP not advertised in some cases. ([#5141](https://github.com/antrea-io/antrea/pull/5141), [@tnqn])
...

@tnqn
Copy link
Member

tnqn commented Jun 28, 2023

I see. It's because #3789 added a step to search cherry-pick PRs and include their original PRs to "Changed" section. Then it makes sense to exclude them in "Unlabelled".

Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM

@tnqn
Copy link
Member

tnqn commented Jun 28, 2023

/skip-all

@tnqn tnqn merged commit a84eb0e into antrea-io:main Jun 28, 2023
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