From 8abf4dc699fd4455380ab92a8c0363c91b563744 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 16 Mar 2017 16:37:05 -0400 Subject: [PATCH] add a test page to the build structure for release notes The release notes build needs a page that uses an unconstrained "release-notes" directive so that the build in the CI system includes the patch being proposed. In cases where a branch name is specified, only changes already merged into that branch (not submitted to it) are included. This patch adds the missing file using the convention used elsewhere (calling it unreleased.rst). It leaves the release-notes directive in index.rst because I'm not sure whether that's where you want "published" notes to appear. It removes the branch setting in config.yaml so that when reno is not given a branch it uses the current branch by default. This allows patches under test to be included in the build, so that formatting errors in the notes will cause the build to break before the patches are merged. It also reorganizes the order of the release notes pages to match the order used by convention and expected by the repository branching script so that when this repo is branched the new release note page for the series can be added automatically by the branch script. Change-Id: Ibccdac675915ab3535f2b2fbc1f4daee6990048b Signed-off-by: Doug Hellmann squash Change-Id: Ie795176a7e860e10acb2cfa2e9d21c1d08ba8a48 Signed-off-by: Doug Hellmann --- releasenotes/config.yaml | 1 - releasenotes/source/index.rst | 5 +++-- releasenotes/source/unreleased.rst | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 releasenotes/source/unreleased.rst diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml index 96a949a5c0..b1e4401190 100644 --- a/releasenotes/config.yaml +++ b/releasenotes/config.yaml @@ -1,5 +1,4 @@ --- -branch: master earliest_version: collapse_pre_releases: false stop_at_branch_base: true diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index b31ee2d3e8..b646e79292 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -22,6 +22,7 @@ Contents .. toctree:: :maxdepth: 2 - mitaka.rst - newton.rst + unreleased ocata.rst + newton.rst + mitaka.rst diff --git a/releasenotes/source/unreleased.rst b/releasenotes/source/unreleased.rst new file mode 100644 index 0000000000..c88b67f62f --- /dev/null +++ b/releasenotes/source/unreleased.rst @@ -0,0 +1,5 @@ +==================================== + Release Notes for Work In Progress +==================================== + +.. release-notes::