summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-11-27 14:46:13 -0800
committerGitHub <noreply@github.com>2020-11-27 14:46:13 -0800
commitbb7d70c86d8af2d3acee51ea09e61ff638e1265f (patch)
tree38432762f8810e575b3c65c3e9b7036a860b2d2b
parent59959ba8678d5fbfc8e612c3b994e8b799c393f3 (diff)
parent72a91ad7c304014508a4e7db625d0ccd9c683f64 (diff)
downloadchef-bb7d70c86d8af2d3acee51ea09e61ff638e1265f.tar.gz
Merge pull request #10697 from chef/update_cadence_docs
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--README.md2
-rw-r--r--docs/dev/design_documents/client_release_cadence.md12
2 files changed, 6 insertions, 8 deletions
diff --git a/README.md b/README.md
index 6686b49ba4..6c3373a2af 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[![Code Climate](https://codeclimate.com/github/chef/chef.svg)](https://codeclimate.com/github/chef/chef)
[![Build Status](https://badge.buildkite.com/c82093430ceec7d27af05febb9dcafe3aa331fff9d74c0ab9d.svg?branch=master)](https://buildkite.com/chef-oss/chef-chef-master-verify)
[![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef)
-[![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef/blob/v15.2.21/docs/dev/design_documents/client_release_cadence.md)
+[![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef/blob/master/docs/dev/design_documents/client_release_cadence.md)
**Umbrella Project**: [Chef Infra](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-infra.md)
diff --git a/docs/dev/design_documents/client_release_cadence.md b/docs/dev/design_documents/client_release_cadence.md
index b3a9f741ec..21fa5546d9 100644
--- a/docs/dev/design_documents/client_release_cadence.md
+++ b/docs/dev/design_documents/client_release_cadence.md
@@ -1,17 +1,15 @@
-# Chef Release Cadence
+# Chef Infra Client Release Cadence
-Chef follows [Semantic Versioning](https://semver.org/) for releases. Major versions (eg. 11.x -> 12.x) will include backwards-incompatible changes. Minor versions (eg 12.1 -> 12.2) will include new features and bug fixes, but will be backwards-compatible to the best of our ability. Patch releases will contain bug and security fixes only.
+Chef Infra Client follows [Semantic Versioning](https://semver.org/) for releases. Major versions (eg. 16.x -> 17.x) will include backwards-incompatible changes. Minor versions (eg 16.7 -> 16.8) will include new features and bug fixes, but will be backwards-compatible to the best of our ability. Patch releases will contain bug and security fixes only.
-Chef feature releases are promoted to the stable channel once per month. It is expected that this occur during the second week of the month unless circumstances intervene. Additional patch releases for a given feature release may be promoted if critical issues are found.
+Chef Infra Client feature releases are promoted to the stable channel once per month. It is expected that this occur during the second week of the month unless circumstances intervene. Additional patch releases for a given feature release may be promoted if critical issues are found.
-ChefDK is released once per month. It is expected that this occur during the fourth week of the month unless circumstances intervene.
-
-Both Chef and ChefDK will prepare a release candidate before the target release date, usually in the week before but at least three business days before release.
+Chef Workstation is released once per month in order to pull in the latest Chef Infra Client. It is expected that this occur during the fourth week of the month unless circumstances intervene.
The Chef release in April of each year is a major version release, which will contain backwards-incompatible changes. A reminder notice will be sent via Discourse and Slack in March that will summarize the changes slated for the release.
## Rationale
-Monthly releases help ensure we get new features and minor bug fixes out to Chef users in a timely fashion while not overloading the maintainer teams. Similarly, offsetting the Chef and ChefDK releases allows the full attention of the Chef development team on each of those releases, and leaves time for any potential hot fixes or follow-up.
+Monthly releases help ensure we get new features and minor bug fixes out to Chef Infra users in a timely fashion while not overloading the maintainer teams. Similarly, offsetting the Chef Infra Client and Chef Workstation releases allows Workstation to ship with current Chef Infra Client releases.
Major releases in April avoids releasing during winter holidays, summer vacations, ChefConf, and Chef Summits.