(tooling-trusted-releases) 05/05: Use DOWNLOAD_URL not DOWNLOAD_PAGE in default announce template

[ak...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andrewmusselman pushed a commit to branch fix-broken-e2e-tests
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git

commit 7d6d5e25b98ff745f6b55d25a1daf545f13ec41c
Author: Andrew Musselman <ak...@apache.org>
AuthorDate: Fri May 22 02:30:45 2026 +0000

    Use DOWNLOAD_URL not DOWNLOAD_PAGE in default announce template
    
    The default announce-release email template
    (Project.policy_announce_release_default) reads:
    
        Downloads are available from the following URL:
    
        {{DOWNLOAD_PAGE}}
    
    construct.announce_release_subject_and_body substitutes
    {{DOWNLOAD_PAGE}} from project.download_page (an optional, often empty
    field) and {{DOWNLOAD_URL}} from a constructed URL of the form
    https://{host}/downloads/{committee}/[{path_suffix}/]. The line says
    "Downloads are available from the following URL:" and then expands
    the wrong variable, so projects with no custom download_page (e.g.
    the test project) get a blank line where the URL should be:
    
        Downloads are available from the following URL:
    
        On behalf of...
    
    The download_path_suffix form field on /announce/<project>/<version>
    and the announce-confirm.js preview both feed DOWNLOAD_URL, so the
    intent of the template is to surface that value. Replace
    {{DOWNLOAD_PAGE}} with {{DOWNLOAD_URL}} so:
    
    1. New releases get a working download URL in the announce body
       without needing the committee to set project.download_page.
    2. Editing download_path_suffix on the announce form actually
       updates the visible URL in the email body, which is the whole
       point of that field.
    3. e2e/announce/test_get.py::test_body_contains_public_downloads_url_by_default,
       test_body_updates_download_url_while_pristine, and
       test_body_stops_syncing_after_customization start passing.
    
    Projects that previously relied on the template surfacing their
    download_page (if any) can override policy_announce_release_template
    to restore the old behaviour, but the default now matches what every
    other piece of the announce flow already assumes.
---
 atr/models/sql.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/atr/models/sql.py b/atr/models/sql.py
index 8734f7c8..2a04c7b9 100644
--- a/atr/models/sql.py
+++ b/atr/models/sql.py
@@ -910,7 +910,7 @@ This is a stable release available for production use.
 
 Downloads are available from the following URL:
 
-{{DOWNLOAD_PAGE}}
+{{DOWNLOAD_URL}}
 {{DISCLAIMER}}
 On behalf of the Apache {{COMMITTEE}} project team,
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org