From f8c061244a922690fd2729839d67368a5a28ed59 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 28 Feb 2025 12:48:29 -0800 Subject: [PATCH] release guide: set EOL at branch, Update EOLs at final This updates the branch time instructions to include setting an EOL for Branched. With https://pagure.io/fedora-infra/toddlers/pull-request/326 we no longer need to avoid doing it, and we should set one at branch time to be in sync with the schedule and fedora-release. We also update the instructions at Final release time to be more explicit about what the EOL should be set to, syncing it with the schedule and fedora-release, and also checking the EOLs for other releases. We drop the reference to `adjust-eol-all.py` because that was for PDC. Signed-off-by: Adam Williamson --- modules/release_guide/pages/final_release.adoc | 16 ++++++++-------- .../release_guide/pages/sop_mass_branching.adoc | 16 ++++++++++------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/modules/release_guide/pages/final_release.adoc b/modules/release_guide/pages/final_release.adoc index 18e7ddd..1d34b54 100644 --- a/modules/release_guide/pages/final_release.adoc +++ b/modules/release_guide/pages/final_release.adoc @@ -24,15 +24,21 @@ Set the bodhi stable tag to point to updates instead of base repo $ bodhi releases edit --name F{branched} --stable-tag f{branched}-updates .... -Set EOL of oldest release to correct date +Set EOL of oldest release to correct date: four weeks after the official release date of {branched}. [source,subs="attributes+"] .... $ bodhi releases edit --name F{old_release} --eol YYYY-MM-DD $ bodhi releases edit --name F{old_release}C --eol YYYY-MM-DD $ bodhi releases edit --name F{old_release}F --eol YYYY-MM-DD -$ bodhi releases edit --name F{old_release}M --eol YYYY-MM-DD .... +If this date is different from the one in the https://fedorapeople.org/groups/schedule/f-{old_release}/f-{old_release}-key-tasks.html[Fedora schedule], +ask the program manager to update the date in the schedule. +If it is different from the one in F{old_release}'s `/etc/os-release`, https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&format&component=fedora-release&version=40[file a bug against fedora-release] asking for it to be updated. + +You may also wish to check the current EOL estimates for other releases on Bodhi, the schedule, and fedora-release, +and make sure they are in sync and sensible. + == Atomic desktops changes Run the releng scripts/update_ostree_refs.sh on a compose machine with /mnt/koji/ mounted. @@ -97,12 +103,6 @@ Make sure to grab the directory size usage numbers which is used to send an email to [.title-ref]#mirror-admin@lists.fedoraproject.org# list. ==== -== Check and set EOL on previous releases to reflect reality - -. check the fedora schedule for active releases and respective EOL date -. if needed run the adjust-eol-all.py script from releng repository to -correct any mistakes - == Make sure there are no tagging leftovers from bodhi Sometimes builds are not properly tagged during the freeze process. diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 790bc94..1d524e0 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -190,6 +190,16 @@ infra ansible repo. This change includes, updating `koji-sync-listener.py`, Please check these files from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference. +Also, set the EOL date for the new release to match the one in the +https://fedorapeople.org/groups/schedule/f-{branched}/f-{branched}-key-tasks.html[Fedora schedule]: + +[source,subs="attributes+"] +.... +$ bodhi releases edit --name F{branched} --eol YYYY-MM-DD +$ bodhi releases edit --name F{branched}C --eol YYYY-MM-DD +$ bodhi releases edit --name F{branched}F --eol YYYY-MM-DD +.... + == Toddlers === Add new SLA to the toddlers App @@ -584,12 +594,6 @@ $ rm -f latest $ ln -s ../f{rawhide}-build/latest ./latest ---- -=== Make sure branched release does not have set EOL -Presence/absence of EOL date is the way the -https://pagure.io/fedora-infra/toddlers/blob/main/f/toddlers/plugins/koji_block_retired.py[toddler -koji_block_retired] distinguishes between stable and branched releases. EOL should be filled -once a release becomes stable. - === Updating MirrorManager We need to update the mirrormanager so that it will point rawhide to the