Include post-release updates to CHANGELOG.md in release process

etc/make_release.py

@@ -496,9 +496,10 @@ def get_jira_project_versions(auth_jira):
 def get_all_issues_for_version(auth_jira, release_version):
     """
     Return a list of all issues in the project assigned to the given release.
+    Excludes the ticket created to track the release itself.
     """
 
-    jql_query = 'project={} and fixVersion={} ORDER BY issueKey ASC'\
+    jql_query = 'project={} and fixVersion={} and (labels IS EMPTY OR labels != release) ORDER BY issueKey ASC'\
             .format(str(CXX_PROJ_ID), release_version)
     return auth_jira.search_issues(jql_query, maxResults=0)
 

etc/releasing.md

@@ -38,11 +38,6 @@ Update Jira ticket types and titles as appropriate.
 User-facing issues should generally be either "Bug" or "New Feature".
 Non-user facing issues should generally be "Task" tickets.
 
-## Update CHANGELOG.md
-
-Check Jira for tickets closed in this fix version. Consider updating CHANGELOG.md
-with notable changes not already mentioned.
-
 ## Clone and set up environment
 
 Do a fresh clone, to avoid local git branches or IDE files from interfering.
@@ -68,6 +63,10 @@ the instructions. If doing a patch release (e.g. releasing rX.Y.Z with non-zero
 `Z`), check out the corresponding release branch, which should be an existing
 `releases/vX.Y` branch.
 
+Check Jira for tickets closed in this fix version. Update CHANGELOG.md
+with notable changes not already mentioned. Update CHANGELOG.md to remove
+the text `[Unreleased]` for the title of this release. Commit this change.
+
 Create a tag for the commit to serve as the release (or release candidate):
 
 ```
@@ -209,6 +208,32 @@ pushed.
   `docs/`. This may require pushing the commit to a fork of the C++ Driver
   repository and creating a pull request.
 
+## Update CHANGELOG.md for next release
+
+### For a minor release (e.g. r1.2.0):
+
+Open a PR to the master branch to add a new empty `[Unreleased]` section to the CHANGELOG.md for the next minor release. Example:
+
+```md
+## 1.3.0 [Unreleased]
+```
+
+Open a PR to the release branch (e.g. `releases/v1.2`) to add a new empty `[Unreleased]` section to the CHANGELOG.md for the next patch release. Example:
+
+```md
+## 1.2.1 [Unreleased]
+```
+
+### For a patch release (e.g. r1.2.3):
+
+Open a PR to the `master` branch to add the notes of the recent release (`r1.2.3`) to the `master` branch. This is intended to keep release notes for all releases in master for easier searching.
+
+Open a PR to the release branch (e.g. `releases/v1.2`) branch to add a new empty `[Unreleased]` section to the CHANGELOG.md for the next patch release. Example:
+
+```md
+## 1.2.4 [Unreleased]
+```
+
 ## Homebrew
 This requires a macOS machine.
 If this is a stable release, update the [mongo-cxx-driver](https://github.com/Homebrew/homebrew-core/blob/master/Formula/mongo-cxx-driver.rb) homebrew formula, using: `brew bump-formula-pr --url <tarball url>`