From 3688262dd069ddc5604c244e48dcc6b29602a44b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Nov 10 2016 01:17:12 +0000
Subject: Adjust to 'Final' milestone becoming 'RC' from Fedora 24 on


With Pungi 4 (Fedora 24+), the Final milestone more or less was
renamed to RC. Mostly let's allow both, but drop 'Final' from
report-results as no-one should be filing results on 23 or
earlier any more. Note that wikitcms will, as a kindness, change
Final to RC for 24+, so asking for '25 Final 1.1' will get you
25 RC 1.1.

---

diff --git a/relval/cli.py b/relval/cli.py
index 79c952f..d2ee1df 100755
--- a/relval/cli.py
+++ b/relval/cli.py
@@ -109,10 +109,10 @@ def parse_args():
     # Help texts shared by multiple sub-commands.
     release_help = "The Fedora release to operate on (22, 23, 24...)"
     milestone_help_specific = (
-        "The milestone to operate on (Alpha, Beta, Final)")
+        "The milestone to operate on (Alpha, Beta, Final, RC)")
     milestone_help = (
-        "The milestone to operate on (Alpha, Beta, Final, Branched, "
-        "Rawhide). Must be specified for a TC/RC; for a nightly event, "
+        "The milestone to operate on (Alpha, Beta, Final, RC, Branched, "
+        "Rawhide). Must be specified for non-nightly; for a nightly event, "
         "will be guessed if not specified")
     compose_help = "The compose to operate on (1.1, 20160314.n.0)"
     username_help = "Your wiki (FAS) username"
@@ -168,7 +168,7 @@ def parse_args():
         choices=list(range(24, 100)))
     parser_compose.add_argument(
         '-m', '--milestone', help=milestone_help,
-        choices=['Alpha', 'Beta', 'Final', 'Branched', 'Rawhide'])
+        choices=['Alpha', 'Beta', 'Final', 'RC', 'Branched', 'Rawhide'])
     parser_compose.add_argument(
         '-c', '--compose', help=compose_help, metavar="1.1 or "
         "20160314.n.0")
@@ -200,7 +200,7 @@ def parse_args():
         choices=list(range(12, 100)))
     parser_userstats.add_argument(
         '-m', '--milestone', help=milestone_help_specific,
-        choices=['Alpha', 'Beta', 'Final'])
+        choices=['Alpha', 'Beta', 'Final', 'RC'])
     parser_userstats.add_argument(
         '-t', '--test', help=test_help, action='store_true')
     parser_userstats.add_argument(
@@ -225,7 +225,7 @@ def parse_args():
         choices=list(range(12, 100)))
     parser_tcstats.add_argument(
         '-m', '--milestone', help=milestone_help_specific,
-        choices=['Alpha', 'Beta', 'Final'])
+        choices=['Alpha', 'Beta', 'Final', 'RC'])
     parser_tcstats.add_argument(
         '-o', '--out', help="The directory to write the pages to. WILL BE "
         "OVERWRITTEN if it already exists", metavar='/some/path')
@@ -250,7 +250,7 @@ def parse_args():
         choices=list(range(12, 100)))
     parser_result.add_argument(
         '-m', '--milestone', help=milestone_help,
-        choices=['Alpha', 'Beta', 'Final', 'Branched', 'Rawhide'])
+        choices=['Alpha', 'Beta', 'Final', 'RC', 'Branched', 'Rawhide'])
     parser_result.add_argument(
         '-c', '--compose', help=compose_help, metavar="1.1 or 20160314.n.0")
     parser_result.add_argument(
@@ -272,7 +272,7 @@ def parse_args():
         choices=list(range(1, 100)), metavar="1-99")
     parser_sizecheck.add_argument(
         '-m', '--milestone', help="A milestone to check (e.g. Alpha or "
-        "Beta)", choices=['Alpha', 'Beta', 'Final', 'Branched', 'Rawhide'])
+        "Beta)", choices=['Alpha', 'Beta', 'Final', 'RC', 'Branched', 'Rawhide'])
     parser_sizecheck.add_argument(
         '-c', '--compose', help=compose_help, metavar="1.1 or 20160314.n.0")
     parser_sizecheck.add_argument(
diff --git a/relval/report_results.py b/relval/report_results.py
index 2756ee4..2ed7506 100644
--- a/relval/report_results.py
+++ b/relval/report_results.py
@@ -199,11 +199,11 @@ def report_results(wiki, username, release=None, milestone='', compose='',
             version_type = get_response(prompt, helptext, accepted=('c', 'n'))
 
         if version_type == 'c':
-            prompt = ("(A)lpha\n(B)eta\n(F)inal\nWhich milestone would "
+            prompt = ("(A)lpha\n(B)eta\n(R)C\nWhich milestone would "
                       "you like to report a milestone for? ")
-            helptext = "Please choose (A)lpha, (B)eta, or (F)inal."
-            milestone = get_response(prompt, helptext, accepted=('a', 'b', 'f'))
-            for (let, full) in (('a', 'Alpha'), ('b', 'Beta'), ('f', 'Final')):
+            helptext = "Please choose (A)lpha, (B)eta, or (R)C."
+            milestone = get_response(prompt, helptext, accepted=('a', 'b', 'r'))
+            for (let, full) in (('a', 'Alpha'), ('b', 'Beta'), ('r', 'RC')):
                 if milestone == let:
                     milestone = full
             if not compose: