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

contrib: Add release helper scripts for preparing micro releases #13044

Merged
merged 1 commit into from Sep 16, 2020

Conversation

joestringer
Copy link
Member

@joestringer joestringer commented Sep 2, 2020

Automate the preparation of micro releases via a set of scripts. Steps in this PR:

  • Run start-release.sh to generate helm charts, authors, changelogs, etc. Provide target release version and GH project number for N+1 version.
  • Inspect changes and create commit with name "Prepare for release vX.Y.Z".
  • Run submit-release.sh to send PR for this commit
  • Manually close the old GH project
  • Review & merge PR
  • Pull release branch for true version of release commit
  • tag-release.sh to tag current release & push releases (requires GPG key)
  • Continue other steps from templates

Backporting

For backports, the docs and GH issue template changes can be dropped, it's only useful to have the scripts.

@joestringer joestringer added the release-note/misc This PR makes changes that have no direct user impact. label Sep 2, 2020
@joestringer joestringer requested a review from a team as a code owner September 2, 2020 03:42
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

LGTM, only a small thing missing.

.github/ISSUE_TEMPLATE/release_template.md Outdated Show resolved Hide resolved
Copy link
Member

@christarazi christarazi left a comment

Choose a reason for hiding this comment

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

Thanks for PRing these! A few minor comments below. Do you intend to merge this when ready or wait to give them a whirl on the next release, then merge?

contrib/release/prep-changelog.sh Outdated Show resolved Hide resolved
contrib/release/tag-release.sh Outdated Show resolved Hide resolved
@joestringer
Copy link
Member Author

Do you intend to merge this when ready or wait to give them a whirl on the next release, then merge?

I'm fine to go either way. No specific rush for this PR but if it's easier to iterate on the scripts in-tree then we can do so. I guess for ease of use we should also backport them to each branch so they're available locally (for those who don't have a separate Cilium git tree for each release).

@joestringer joestringer marked this pull request as draft September 3, 2020 22:12
Signed-off-by: Joe Stringer <joe@cilium.io>
@joestringer joestringer marked this pull request as ready for review September 15, 2020 21:27
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.6.12 Sep 15, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.10 Sep 15, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.4 Sep 15, 2020
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

I didn't look at the scripts. I'll try them out in the next release and see how they go 🎉

@aanm aanm merged commit 5388518 into cilium:master Sep 16, 2020
@joestringer joestringer deleted the submit/release-scripts branch September 16, 2020 23:24
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.7 in 1.7.10 Sep 17, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.8 in 1.8.4 Sep 18, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.7 to Backport done to v1.7 in 1.7.10 Sep 18, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.8 to Backport done to v1.8 in 1.8.4 Sep 21, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.6 in 1.6.12 Sep 22, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.6 to Backport done to v1.6 in 1.6.12 Sep 24, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.6 to Backport done to v1.6 in 1.6.12 Sep 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.6.12
Backport done to v1.6
1.7.10
Backport done to v1.7
1.8.4
Backport done to v1.8
Development

Successfully merging this pull request may close these issues.

None yet

6 participants