From 740051f3498d19171d6c0aef6f409afc8c159114 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 25 Mar 2020 21:23:09 -0500 Subject: [PATCH] script: update backport scripts for now-released octopus Signed-off-by: Sage Weil --- doc/dev/release-kickoff-checklist.rst | 6 ++---- src/script/backport-resolve-issue | 5 +++-- src/script/ceph-release-notes | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/dev/release-kickoff-checklist.rst b/doc/dev/release-kickoff-checklist.rst index cee1c80b9ad4e..01b8626425e53 100644 --- a/doc/dev/release-kickoff-checklist.rst +++ b/doc/dev/release-kickoff-checklist.rst @@ -28,10 +28,8 @@ Make sure X (and, ideally, X+1) is defined: Scripts ~~~~~~~ -- [ ] src/script/backport-create-issue (releases()) -- [ ] src/script/backport-resolve-issue (releases(), ver_to_release().. but for X-1) -- [ ] src/script/ceph-backport.sh (try_known_milestones()) -- [ ] src/script/ceph-release-notes (X-1) +- [x] src/script/backport-resolve-issue (releases(), ver_to_release().. but for X-1) +- [x] src/script/ceph-release-notes (X-1) Misc ~~~~ diff --git a/src/script/backport-resolve-issue b/src/script/backport-resolve-issue index c6641a2cee88f..5196ff5ce7940 100755 --- a/src/script/backport-resolve-issue +++ b/src/script/backport-resolve-issue @@ -324,7 +324,7 @@ def read_from_file(fs): def releases(): return ('argonaut', 'bobtail', 'cuttlefish', 'dumpling', 'emperor', 'firefly', 'giant', 'hammer', 'infernalis', 'jewel', 'kraken', - 'luminous', 'mimic', 'nautilus') + 'luminous', 'mimic', 'nautilus', 'octopus') def report_params(a): global dry_run @@ -350,7 +350,8 @@ def tag_sha1(repo, sha1): def ver_to_release(): return {'v9.2': 'infernalis', 'v10.2': 'jewel', 'v11.2': 'kraken', - 'v12.2': 'luminous', 'v13.2': 'mimic', 'v14.2': 'nautilus'} + 'v12.2': 'luminous', 'v13.2': 'mimic', 'v14.2': 'nautilus', + 'v15.2': 'octopus'} def usage(): logging.error("Redmine credentials are required to perform this operation. " diff --git a/src/script/ceph-release-notes b/src/script/ceph-release-notes index a7a155828062d..244cb46c7ff1f 100755 --- a/src/script/ceph-release-notes +++ b/src/script/ceph-release-notes @@ -184,7 +184,7 @@ def make_release_notes(gh, repo, ref, plaintext, verbose, strict, use_tags): if strict: title_re = ( - '^(?:hammer|infernalis|jewel|kraken|luminous|mimic|nautilus):\s+(' + + '^(?:hammer|infernalis|jewel|kraken|luminous|mimic|nautilus|octopus):\s+(' + '|'.join(prefixes) + ')(:.*)' ) -- 2.39.5