From 8b99cfa2bc9ac79ac0ab4cd6db9554d5efa62ea8 Mon Sep 17 00:00:00 2001 From: Patrik Polakovic Date: Oct 01 2025 17:10:53 +0000 Subject: Change paths/names as part of releng repo cleanup Related PR: pagure.io/releng/pull-request/12970 Related issue: pagure.io/releng/issue/12934 Signed-off-by: Patrik Polakovic --- diff --git a/modules/release_guide/pages/sop_create_release_signing_key.adoc b/modules/release_guide/pages/sop_create_release_signing_key.adoc index f022ecf..4e0c850 100644 --- a/modules/release_guide/pages/sop_create_release_signing_key.adoc +++ b/modules/release_guide/pages/sop_create_release_signing_key.adoc @@ -248,7 +248,7 @@ this change the next time puppet refreshes. We can verify that the key was created in sigul, the correct users have access to the key, the key was added to the fedora-release package, that the website -was updated with the right key, that sigulsign_unsigned was properly updated, +was updated with the right key, that koji_rpm_signer.py was properly updated, and that the key was successfully updated to the public key servers. === Sigul diff --git a/modules/release_guide/pages/sop_file_ftbfs.adoc b/modules/release_guide/pages/sop_file_ftbfs.adoc index ddd86ee..3e1e9b6 100644 --- a/modules/release_guide/pages/sop_file_ftbfs.adoc +++ b/modules/release_guide/pages/sop_file_ftbfs.adoc @@ -30,7 +30,7 @@ The FTBFS bugs are filed in bugzilla. $ sudo dnf install python-bugzilla-cli ``` -. Update the `massrebuildsinfo.py`: +. Update the `mass_rebuilds_info.py`: * epoch * buildtag * destag diff --git a/modules/release_guide/pages/sop_final_release.adoc b/modules/release_guide/pages/sop_final_release.adoc index 1749d68..d23378b 100644 --- a/modules/release_guide/pages/sop_final_release.adoc +++ b/modules/release_guide/pages/sop_final_release.adoc @@ -40,9 +40,9 @@ 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. +Run the releng scripts_new/release-process/atomic/update_ostree_refs.sh on a compose machine with /mnt/koji/ mounted. -$ scripts/update_ostree_refs.sh {branched} +$ scripts_new/release-process/atomic/update_ostree_refs.sh {branched} This updates the refs for Atomic desktops to have users follow updates for the new release rather than being stuck on the GA compose forever. diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 12a221c..3eacba4 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -30,10 +30,10 @@ key, but we need to resign everything with the f{rawhide_next} key for rawhide. ``` This allows robosignatory to sign packages in the f{rawhide} tag with the f{rawhide_next} key. * git clone https://pagure.io/releng -* confirm the new key fingerprint is in scripts/sigulsign_unsigned.py -* run sigulsign_unsigned.py to gather list of packages to sign: +* confirm the new key fingerprint is in scripts_new/release-process/signing/koji_rpm_signer.py +* run koji_rpm_signer.py to gather list of packages to sign: ``` -./sigulsign_unsigned.py --just-list --tag f{rawhide} fedora-{rawhide_next} | grep src | sed -e 's|.src||' > unsigned-packages +./scripts_new/release-process/signing/koji_rpm_signer.py --just-list --tag f{rawhide} fedora-{rawhide_next} | grep src | sed -e 's|.src||' > unsigned-packages ``` You should get a list of all the source packages by name. * copy unsigned-packages list to autosign01 @@ -51,7 +51,7 @@ do done ``` This will iterate over all packages and sign them with the new f{rawhide_next} key. -Once complete, re-run the ./sigulsign_unsigned.py command to confirm all are signed. +Once complete, re-run the `./scripts_new/release-process/signing/koji_rpm_signer.py` command to confirm all are signed. On branching day, remove the robosignatory config for this resigning. [NOTE] @@ -181,8 +181,8 @@ Before running the script, you need to **obtain the script from the Fedora RelEn **Option 1: Clone the RelEng repository** ```bash $ git clone https://pagure.io/releng.git -$ cd releng/scripts/branching -$ chmod +x get_all_active_packages_branching.sh +$ cd releng/scripts_new/release-process/mass-branching/fedora/ +$ chmod +x get_active_packages.sh ``` This will generate the file components_f{branched}.txt, which contains all valid, active, and imported packages, prefixed with rpm/. @@ -301,9 +301,9 @@ Ask someone in fedora infra to run the robosignatory playbook. The koji build system needs to have some tag/target work done to handle builds from the new branch and to update where builds from rawhide go. -Run -https://pagure.io/releng/blob/main/f/scripts/branching/make-koji-release-tags[make-koji-release-tags] -script in https://pagure.io/releng[pagure releng] repo +Run the +https://pagure.io/releng/blob/main/f/scripts_new/release-process/mass-branching/fedora/create_koji_release_tags.sh[create_koji_release_tags.sh] +script in the https://pagure.io/releng[Pagure release engineering repository]. == Fedora Release @@ -534,13 +534,13 @@ $ 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_empty_repos.sh] -from https://pagure.io/releng[pagure releng] repo. This should be run on +https://pagure.io/releng/blob/main/f/scripts_new/release-process/mass-branching/fedora/create_empty_repositories.sh[create_empty_repositories.sh] +from the https://pagure.io/releng[Pagure release engineering repository]. This should be run on *bodhi-backend01.phx2.fedoraproject.org* [source,bash,subs="attributes"] ---- -$ sudo -u ftpsync sh scripts/branching/create_empty_repos.sh {branched} +$ sudo -u ftpsync sh scripts_new/release-process/mass-branching/fedora/create_empty_repositories.sh {branched} ---- [NOTE] diff --git a/modules/release_guide/pages/sop_release_eol.adoc b/modules/release_guide/pages/sop_release_eol.adoc index ad5aa43..dc7b66a 100644 --- a/modules/release_guide/pages/sop_release_eol.adoc +++ b/modules/release_guide/pages/sop_release_eol.adoc @@ -66,14 +66,14 @@ a sidetag will leave it in a weird state where it cannot be removed. * Purge from disk the signed copies of rpms that are signed with the EOL'd release key. To achieve this, add the release key to -*koji_cleanup_signed.py* script in https://pagure.io/releng[releng] repo +*koji_cleanup_signed_rpms.py* script in https://pagure.io/releng[releng] repo and run the script on compose-branched01.rdu3.fedoraproject.org: .... tmux sudo su cd /root/releng -./scripts/koji_cleanup_signed.py +./scripts_new/release-process/end-of-life/koji_cleanup_signed_rpms.py .... [NOTE] diff --git a/modules/releng_misc_guide/pages/sop_signing_builds.adoc b/modules/releng_misc_guide/pages/sop_signing_builds.adoc index 38e9ad9..88b06d5 100644 --- a/modules/releng_misc_guide/pages/sop_signing_builds.adoc +++ b/modules/releng_misc_guide/pages/sop_signing_builds.adoc @@ -15,14 +15,14 @@ another change at seeing the signing .... $ koji move $dist-updates-testing-pending $dist-signing-pending $build .... -* If need be, sign builds using scripts/sigulsign_unsigned.py from +* If need be, sign builds using scripts_new/release-process/signing/koji_rpm_signer.py from releng git repo + _NOTE! This will NOT help if Bodhi marks a build as unsigned!_ + [source,subs="attributes+"] .... -$ ./sigulsign_unsigned.py -vv --write-all \ +$ ./scripts_new/release-process/signing/koji_rpm_signer.py -vv --write-all \ --sigul-batch-size=25 fedora-{branched} \ $(cat /var/cache/sigul/Stable-F{branched} /var/cache/sigul/Testing-F{branched}) ....