script/ceph-release-notes: alternate merge commit format

When PRs are merged via GitHub web GUI, the merge commit looks like
this:

    Merge pull request #27161 from cbodley/wip-qa-rgw-nautilus

however, nowadays PRs are also getting merged via the "ptl-tool.py" CLI
tool, which generates merge commits that look like this:

    Merge PR #27139 into nautilus

This commit adapts the regex so it matches both.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/src/script/ceph-release-notes b/src/script/ceph-release-notes
index 04d12cbc8c375d25dea57938bdbf251c167311bc..a7a155828062d61746633200448ddf1b973bbe1a 100755 (executable)
--- a/src/script/ceph-release-notes
+++ b/src/script/ceph-release-notes
@@ -41,7 +41,7 @@ reviewed_by_re = re.compile(r"Rev(.*)By", re.IGNORECASE)
 labels = {'bluestore', 'build/ops', 'cephfs', 'common', 'core', 'mgr',
           'mon', 'performance', 'pybind', 'rdma', 'rgw', 'rbd', 'tests',
           'tools'}
-merge_re = re.compile("Merge pull request #(\d+).*")
+merge_re = re.compile("Merge (pull request|PR) #(\d+).*")
 # prefixes is the list of commit description prefixes we recognize
 prefixes = ['bluestore', 'build/ops', 'cephfs', 'cephx', 'cli', 'cmake',
             'common', 'core', 'crush', 'doc', 'fs', 'librados', 'librbd',
@@ -147,7 +147,7 @@ def make_release_notes(gh, repo, ref, plaintext, verbose, strict, use_tags):
         merge = merge_re.match(commit.summary)
         if not merge:
             continue
-        number = merge.group(1)
+        number = merge.group(2)
         print ("Considering PR#" + number)
         # do not pick up ceph/ceph-qa-suite.git PRs
         if int(number) < 1311: