summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-12-18 12:53:18 -0800
committerGitHub <noreply@github.com>2020-12-18 12:53:18 -0800
commitdaf64d8f87aea2ee5133db64c7cd0e0c4e71ef15 (patch)
tree226c6731ad16be9b8de5c158dc960d4ee6ca24b7
parent571133125620669c4477c3a6c8bd7bfa36b58231 (diff)
downloadchef-daf64d8f87aea2ee5133db64c7cd0e0c4e71ef15.tar.gz
Update bumping_the_major_version.md
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--docs/dev/how_to/bumping_the_major_version.md10
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/dev/how_to/bumping_the_major_version.md b/docs/dev/how_to/bumping_the_major_version.md
index b34e7b0a2c..db21bf4a44 100644
--- a/docs/dev/how_to/bumping_the_major_version.md
+++ b/docs/dev/how_to/bumping_the_major_version.md
@@ -23,7 +23,13 @@ Starting from the master branch create a PR which:
- Edits the `VERSION` file in the root of the repository to the new major release
- Updates the `chef-config` and `chef-utils` dependencies to allow for the new major release of Chef Infra in `ohai.gemspec`
-## Fork Chef master to a stable branch
+## Update chef/chef
+
+### Prep master branch for forking
+
+- In ./expeditor/config.yml add the version_constraint for the new branch, update the version_constraint for master to match the new planned major version and add a constraint for the new stable version / branch
+
+### Fork Chef master to a stable branch
Before bumping the major version of Chef Infra we want to fork off the current master to a new stable branch, which will be used to build hotfix releases. We support the N-1 version of Chef Infra Client for a year after the release of a new major version. For example Chef Infra Client 16 was released in April 2020, at which point Chef Infra Client 15 became the N-1 release. Chef Infra Client 15 will then be maintained with critical bug and security fixes until April 2021.
@@ -33,7 +39,7 @@ On your local machine fork the current master branch to a new stable branch. For
Once you've forked to a new stable branch such as `chef-15` you'll want to create a new branch so you can build a PR, which will get this branch ready for release:
-- In ./expeditor/config.yml add the version_constraint for the new branch, update the version_constraint for master to match the new major version, and remove all the update_dep.sh subscriptions which don't work against stable branches.
+- In ./expeditor/config.yml remove all the update_dep.sh subscriptions which don't work against stable branches.
- In readme.md update the buildkite badge to point to the new stable branch image and link instead of pointing to master.
- In kitchen-tests/Gemfile update the Ohai branch to point to the new Ohai stable
- In kitchen-tests/kitchen.yml update chef_version to be your new stable version and not current. Ex: 15