From aad22e8949034efd9356eb793f457ef7b0867baf Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 12 2025 13:34:05 +0000 Subject: [PATCH 1/7] sop_mass_branching: Alpha doesn't exist any more Signed-off-by: Adam Williamson --- diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 650c6e4..de3821e 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -4,7 +4,7 @@ include::_partials/attributes.adoc[] == Description -At each alpha freeze we branch the pending release away from `devel/` +At each release's "branch point" we branch the pending release away from `devel/` which allows rawhide (currently F{rawhide}) to move on while the pending release goes into bugfix and polish mode. From 4884d70283b597c0cd458312a1a5dfccc9c623f4 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 12 2025 13:34:05 +0000 Subject: [PATCH 2/7] sop_mass_branching: add fedora-kiwi-descriptions to repo list Signed-off-by: Adam Williamson --- diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index de3821e..34d8eb0 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -121,6 +121,8 @@ values. * https://pagure.io/pungi-fedora * https://pagure.io/fedora-kickstarts +* https://pagure.io/fedora-kiwi-descriptions +** Consult Neal Gompa for help with correct changes to this. * https://pagure.io/fedora-comps * https://pagure.io/fedora-lorax-templates/ * https://pagure.io/workstation-ostree-config/ From 845645cc59c7d3f73650a05a275388570bf7a3db Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 12 2025 13:34:05 +0000 Subject: [PATCH 3/7] sop_mass_branching: typo, missing period Signed-off-by: Adam Williamson --- diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 34d8eb0..9cea1b5 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -515,7 +515,7 @@ $ sudo ln -s /mnt/koji/compose/updates/empty-repo/ /mnt/koji/compose/updates/f{b === Creating Empty Repos To create empty repos on the master mirror, run -https://pagure.io/releng/blob/main/f/scripts/branching/create_empty_repos.sh[create_emtpy_repos.sh] +https://pagure.io/releng/blob/main/f/scripts/branching/create_empty_repos.sh[create_empty_repos.sh] from https://pagure.io/releng[pagure releng] repo. This should be run on *bodhi-backend01.phx2.fedoraproject.org* @@ -637,7 +637,7 @@ infra ticket] to update the database of mirrormanager. === Enable autosigning on branched release Once the branched compose is composed, we need to re-enable -robosignatory on branched release +robosignatory on branched release. === ELN related work From 3c878d268b5ae6781fbc3a7433402dd92194e515 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 12 2025 13:34:05 +0000 Subject: [PATCH 4/7] sop_mass_branching: note running playbooks enables Rawhide gating Signed-off-by: Adam Williamson --- diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 9cea1b5..1d19821 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -274,6 +274,11 @@ $ sudo -i ansible-playbook /srv/web/infra/ansible/playbooks/groups/proxies.yml - Avoid running the `koji-hub.yaml` playbook after turning off Koji builders to prevent overwriting manual changes. ==== +[NOTE] +==== +Once you do the above, gating will be enabled on Rawhide updates under the new release number. +==== + Ask someone in fedora infra to run the robosignatory playbook. From 49a2edc6053f49d19f61e6604e8b10b41319acaf Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 12 2025 13:34:05 +0000 Subject: [PATCH 5/7] sop_mass_branching: note no need to do modular mirrormanager repos Signed-off-by: Adam Williamson --- diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 1d19821..bb0c24e 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -637,7 +637,8 @@ new rawhide release. Please follow the instructions in the https://pagure.io/fedora-infrastructure/issue/9239#comment-671446[fedora -infra ticket] to update the database of mirrormanager. +infra ticket] to update the database of mirrormanager, though note that +none of the 'modular' repos exist any more. === Enable autosigning on branched release From ab28798dc26c2f21539f1a600e85342e5ffd612c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 12 2025 13:34:05 +0000 Subject: [PATCH 6/7] sop_mass_branching: add instructions to do composes AFAICS, nothing in the doc currently actually *says* 'you have to do Branched and Rawhide composes once you did everything else'. I think we need that? Signed-off-by: Adam Williamson --- diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index bb0c24e..3e81ef5 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -630,6 +630,17 @@ $ rm -f latest $ ln -s ../f{rawhide}-build/latest ./latest ---- +=== Creating composes + +Once the other changes are all done, we must create post-branching +composes for both the new branched release and Rawhide as soon as +possible. To do this, ssh into the appropriate compose host for the +release (compose-branched01 or compose-rawhide01) and edit the cron +job in `/etc/cron.d`, changing it to run on the next minute - so if +it's currently 14:27, change the first two numbers to 28 14. Once +the compose has started, remember to change the numbers back to their +normal values. + === Updating MirrorManager We need to update the mirrormanager so that it will point rawhide to the From 1655fe2e5c2e562b00348c72205ebca0cd08a4f7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Aug 12 2025 13:34:05 +0000 Subject: [PATCH 7/7] sop_mass_branching: drop redundant note The section on fedora-repos package changes already says to do this, and that's a much more logical place for it. Signed-off-by: Adam Williamson --- diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 3e81ef5..d180699 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -676,11 +676,6 @@ https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/koschei/#_branching_a_ Temporarily disable the rawhide cron job during branching PRs to ensure a branched compose is created. Re-enable rawhide after this. ==== -[NOTE] -==== -In fedora-repos package build for new branched version enable the update-testing repository immediately upon branching. -==== - == Consider Before Running NOTE: FIXME: Need some love here