From f9d89c429ab9cb55171a85713d2715e9a97690c6 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Nov 23 2023 04:45:02 +0000
Subject: Update TESTABLE_TEMPLATE and COMPLETE_TEMPLATE


Update these to the last version from the pgm docs before I
dropped the templates from the docs in favor of the script. Those
versions of the templates seem newer and better.

Note to make the VERSION+1 bits work we need to ensure the type
of options.release is int. I checked and I'm pretty sure this
doesn't break anything else (plus it will give us a degree of
error checking, argparse will exit if the release arg isn't an
integer now).

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/closebugs/fedora_bz.py b/closebugs/fedora_bz.py
index 55e1052..aff15e8 100755
--- a/closebugs/fedora_bz.py
+++ b/closebugs/fedora_bz.py
@@ -31,17 +31,19 @@ ERROR_CODES = {
 BRANCH_TEMPLATE = '''This bug appears to have been reported against 'rawhide' during the {{ PRODUCT }} {{ VERSION }} development cycle.
 Changing version to {{ VERSION }}.'''
 
-TESTABLE_TEMPLATE = '''We have reached the 'Change complete (Testable)' deadline in the {{ PRODUCT }} {{ VERSION }} release schedule.
+TESTABLE_TEMPLATE = '''Today we reached the Code Complete (Testable) milestone on the F{{ VERSION }} schedule: https://fedorapeople.org/groups/schedule/f-{{ VERSION }}/f-{{ VERSION }}-key-tasks.html
 
-At this time, all Changes should be complete enough to be testable. Indicate this by setting this tracking bug to MODIFIED. If the code for this Change is fully complete, you can set the status to ON_QA. The next milestone is the Change complete (100% complete) deadline on {{ DATE }}
+At this time, all F{{ VERSION }} Changes should be complete enough to be testable. You can indicate this by setting this tracker to the MODIFIED status. If the Change is 100% code complete, you can set the tracker to ON_QA. If you need to defer this Change to F{{ VERSION+1 }}, please NEEDINFO me.
 
-If you need to defer this Change to a subsequent release, please needinfo me.'''
+Changes that have not reached at least the MODIFIED status will be given to FESCo for evaluation of contingency plans.'''
 
-COMPLETE_TEMPLATE = '''We have reached the 'Change complete (100% complete)' deadline in the {{ PRODUCT }} {{ VERSION }} release schedule.
+COMPLETE_TEMPLATE = '''-Today we reached the Code Complete (100% complete) milestone on the F{{ VERSION }} schedule: https://fedorapeople.org/groups/schedule/f-{{ VERSION }}/f-{{ VERSION }}-key-tasks.html
 
-At this time, all Changes should be fully complete. Indicate this by setting this tracking bug to ON_QA.
+At this time, all F{{ VERSION }} Changes should be 100% complete. You can indicate this by setting this tracker to the ON_QA status. If you need to defer this Change to F{{ VERSION+1 }} please NEEDINFO me.
 
-If you need to defer this Change to a subsequent release, please needinfo me.'''
+Note that we are entering the Beta freeze. Additional package changes to complete this Change will need an approved blocker or freeze exception. See https://fedoraproject.org/wiki/QA:SOP_blocker_bug_process and https://fedoraproject.org/wiki/QA:SOP_freeze_exception_bug_process for more information.
+
+Changes that have not reached the ON_QA status will be given to FESCo for evaluation of contingency plans.'''
 
 EOL_WARN_TEMPLATE = '''This message is a reminder that {{ PRODUCT }} {{ VERSION }} is nearing its end of life.
 Fedora will stop maintaining and issuing updates for {{ PRODUCT }} {{ VERSION }} on {{ DATE }}.
@@ -346,7 +348,7 @@ parser_eolc = subparsers.add_parser(
 parser_eolc.set_defaults(func=handle_eol, close=True)
 
 for subp in (parser_branch, parser_deadlinet, parser_deadlinec, parser_eolw, parser_eolc):
-    subp.add_argument('release', help='The release to work on')
+    subp.add_argument('release', type=int, help='The release to work on')
 
 for eolp in (parser_eolw, parser_eolc):
     eolp.add_argument(