ci: merge main to release (#9409)

Author: rjsparks

.github/workflows/build.yml

@@ -448,11 +448,11 @@ jobs:
       - name: Refresh Staging DB
         uses: the-actions-org/workflow-dispatch@v4
         with:
-          workflow: update-staging-db.yml
+          workflow: deploy-db.yml
           repo: ietf-tools/infra-k8s
           ref: main
           token: ${{ secrets.GH_INFRA_K8S_TOKEN }}
-          inputs: '{ "sourceDb":"datatracker" }'
+          inputs: '{ "environment":"${{ secrets.GHA_K8S_CLUSTER }}", "app":"datatracker", "manifest":"postgres", "forceRecreate":true, "waitClusterReady":true }'
           wait-for-completion: true
           wait-for-completion-timeout: 10m
           wait-for-completion-interval: 20s

ietf/templates/doc/bofreq/bofreq_template.md

@@ -1,15 +1,15 @@
-# Name: Exact MPLS Edges (EXAMPLE) (There's an acronym for anything if you really want one ;-)
+# Name: EXAct MPLs Edges (EXAMPLE) (There's an acronym for anything if you really want one ;-)
 ## Description 
 Replace this with a few paragraphs describing the BOF request.
 
 Fill in the details below. Keep items in the order they appear here.
 
 ## Required Details
-- Status: (not) WG Forming
-- Responsible AD: name
+- Status: "not WG Forming" or "WG forming"
+- Responsible AD: name (or at least area(s) if you know)
 - BOF proponents: name <email>, name <email> (1-3 people - who are requesting and coordinating discussion for proposal) 
 - Number of people expected to attend: 100
-- Length of session (1 or 2 hours): 2 hours
+- Length of session (1 or usually 2 hours): 2 hours
 - Conflicts (whole Areas and/or WGs)
    - Chair Conflicts: TBD
    - Technology Overlap: TBD
@@ -27,7 +27,7 @@ To allow evaluation of your proposal, please include the following items:
    - Items, Internet-Drafts, speakers, timing
    - Or a URL
 
-## Links to the mailing list, draft charter if any, relevant Internet-Drafts, etc.
+## Links to the mailing list, draft charter if any (for WG-forming BoF), relevant Internet-Drafts, etc.
    - Mailing List: https://www.ietf.org/mailman/listinfo/example
    - Draft charter: {{ settings.IDTRACKER_BASE_URL }}{% url 'ietf.doc.views_doc.document_main' name='charter-ietf-EXAMPLE' %}
    - Relevant Internet-Drafts:

ietf/templates/doc/bofreq/new_bofreq.html

@@ -6,15 +6,39 @@
     {% origin %}
     <h1>Start a new BOF Request</h1>
     <p>
-        The IAB will also attempt to provide BoF Shepherds as described in their document on the subject only on request from the IESG. If you feel that your BoF would benefit from an IAB BoF Shepherd, please discuss this with your Area Director.
+        BoF proponents are strongly encouraged to review the following sources before submitting requests:
+    </p>
+    <ul>
+        <li>Process: <a href="https://www.rfc-editor.org/rfc/rfc2418.html#section-2.4">RFC 2418 Section 2.4</a></li>
+        <li>Considerations for having a successful BoF: <a href="https://www.rfc-editor.org/rfc/rfc5434.html">RFC 5434</a></li>
+    </ul>
+    {# The following block needs to be commented out after the BoF deadline and re-opened before next BoF request opening #}
+    <hr>
+    <p class="lead">
+        Announcement for IETF 124: The IESG and the IAB have organized <em>Ask Me Anything</em> (AMA) virtual sessions 
+        for the community to help proponents who are interested in putting up BoF proposals for IETF 124
+        (see also the <a href="https://mailarchive.ietf.org/arch/msg/ietf-announce/mtAYV3Mu5RfJPR-przzr-Nzxhwc/">IETF-announce</a> email):
+    </p>
+    <ul class="lead">
+        <li>28th of August 13:00-14:00 UTC 
+            <a href="https://datatracker.ietf.org/meeting/interim-2025-iesg-22/sessions/iesg.ics" title="iCalendar entry" aria-label="iCalendar entry"><i class="bi bi-calendar"></i></a></li>
+        <li>28th of August 19:00-20:00 UTC 
+            <a href="https://datatracker.ietf.org/meeting/interim-2025-iesg-23/sessions/iesg.ics" title="iCalendar entry" aria-label="iCalendar entry"><i class="bi bi-calendar"></i></a></li>
+    </ul>
+    <hr>
+    {# End of the temporary block #}
+    <p>
+        The IAB will also attempt to provide BoF Shepherds as described in their document on the subject only on request from the IESG. 
+        If you feel that your BoF would benefit from an IAB BoF Shepherd, please discuss this with your Area Director.
     </p>
     <p>
-        Choose a short descriptive title for your request. Take time to choose a good initial title - it will be used to make the filename for your request's content. The title can be changed later, but the filename will not change.
+        Choose a short descriptive title for your request. Take time to choose a good initial title - it will be used to make the filename for your request's content.
+        The title can be changed later, but the filename will not change.
     </p>
     <p>
         For example, a request with a title of "A new important bit" will be saved as <code>bofreq-{{ user.person.last_name|xslugify|slice:"64" }}-a-new-important-bit-00.md</code>.
     </p>
-    <p>All the items in the template MUST be filed in.</p>
+    <p>All the items in the template <strong>MUST</strong> be filed in.</p>
     <form class="upload-content form-horizontal"
           method="post"
           enctype="multipart/form-data">