]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tools: ceph-release-notes: ignore low-numbered PRs 13151/head
authorNathan Cutler <ncutler@suse.com>
Fri, 27 Jan 2017 13:01:35 +0000 (14:01 +0100)
committerNathan Cutler <ncutler@suse.com>
Fri, 27 Jan 2017 13:01:35 +0000 (14:01 +0100)
Fixes: http://tracker.ceph.com/issues/18695
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/script/ceph-release-notes

index 77bb9dfbe36bfa79bc669026efd3261b91549a90..7937e049e0ff4703ed274f71973a31250ed96232 100755 (executable)
@@ -97,6 +97,11 @@ def make_release_notes(gh, repo, ref, plaintext, verbose, strict, use_tags):
         merge = merge_re.match(commit.summary)
         if merge:
             number = merge.group(1)
+            print ("Considering PR#" + number)
+            # do not pick up ceph/ceph-qa-suite.git PRs
+            if int(number) < 1311:
+                print ("Ignoring low-numbered PR, probably picked up from ceph/ceph-qa-suite.git")
+                continue
             pr = gh.repos("ceph")("ceph").pulls(number).get()
             title = pr['title']
             message_lines = commit.message.split('\n')
@@ -142,7 +147,7 @@ def make_release_notes(gh, repo, ref, plaintext, verbose, strict, use_tags):
                 continue    
             
             if strict:
-                title_re = '^(?:hammer|infernalis|jewel|kraken):\s+(cli|common|mon|msgr|osd|log|librbd|rbd|fs|mds|objecter|rgw|build/ops|tests|tools|cmake|doc|crush|librados)(:.*)'
+                title_re = '^(?:hammer|infernalis|jewel|kraken):\s+(cephx|cli|common|mon|msgr|osd|log|librbd|rbd|fs|mds|objecter|rgw|build/ops|tests|tools|cmake|doc|crush|librados)(:.*)'
                 match = re.match(title_re, title)
                 if not match:
                     print ("ERROR: http://github.com/ceph/ceph/pull/" + str(number) + " title " + title.encode("utf-8") + " does not match " + title_re)