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

Add the "cmrel update-release-branch" command #36

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

maelvls
Copy link
Member

@maelvls maelvls commented Jun 1, 2021

This PR creates a new command cmrel update-release-branch, and the goal is to automate this part of our release-process.

The cmrel update-release-branch --branch release-1.4 does the following:

  • if the branch release-1.4 does not exist, create it,
  • if the branch release-1.4 already exists, merge --ff-only master and push it.

Note that cmrel update-release-branch currently does not know about the "code freeze": cmrel update-release-branch must not be run during a code freeze, since merged PRs myst be cherry picked during that period.

The part of release process in question:

  1. Create or update the release branch:

    • (initial alpha only) Create the release branch:

      # Must be run from the cert-manager repo folder.
      git fetch --all
      git checkout -b release-1.0 origin/master
    • (subsequent alpha, beta and final releases only); You need to
      update the release branch with the latest commits from the master
      branch, as follows:

      # Must be run from the cert-manager repo folder.
      git fetch --all
      git branch --force release-1.0 origin/release-1.0
      git checkout release-1.0
      git merge --ff-only origin/master

      Patch releases do not require this git merge --ff-only step, since
      the merge is done by opening a PR using the /cherry-pick release-1.0 command.

  2. Push the new or updated release branch:

    1. Check that the origin remote is correct. To do that, run the following
      command and make sure it returns
      the upstream https://github.com/jetstack/cert-manager.git:

      # Must be run from the cert-manager repo folder.
      git remote -v | grep origin
    2. Push the release branch:

      # Must be run from the cert-manager repo folder.
      git push --set-upstream origin release-1.0

      (initial alpha only): git push will only work if you have the
      write or admin GitHub permission on the cert-manager repo to create
      or push to the branch, see prerequisites.

@jetstack-bot jetstack-bot added the dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. label Jun 1, 2021
@jetstack-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: maelvls

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jetstack-bot jetstack-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 1, 2021
@maelvls maelvls marked this pull request as draft June 1, 2021 08:36
@jetstack-bot jetstack-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jun 1, 2021
@wallrj
Copy link
Member

wallrj commented Jun 1, 2021

This PR title is wrong I think.

@maelvls
Copy link
Member Author

maelvls commented Jun 2, 2021

Oops, I think I mixed two of my PRs. Thanks for spotting that!

@maelvls maelvls changed the title cmrel staged is now sorted by version and has some --help Add the "cmrel update-release-branch" command Jun 2, 2021
@jetstack-bot jetstack-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 23, 2021
@jetstack-bot
Copy link
Contributor

@maelvls: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants