From cbefa6de11733ddc14831d37269120b3eee2a3c8 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Feb 04 2025 12:46:52 +0000 Subject: Rawhide is now F43 Signed-off-by: Samyak Jain --- diff --git a/modules/release_guide/pages/_partials/attributes.adoc b/modules/release_guide/pages/_partials/attributes.adoc index ebc06cb..01ed9bd 100644 --- a/modules/release_guide/pages/_partials/attributes.adoc +++ b/modules/release_guide/pages/_partials/attributes.adoc @@ -1,8 +1,8 @@ :year: 2024 -:rawhide_next: 43 -:rawhide: 42 -:rawhide_name: Forty Two -:branched: 41 -:branched_name: Forty One -:current: 40 -:old_release: 39 +:rawhide_next: 44 +:rawhide: 43 +:rawhide_name: Forty Three +:branched: 42 +:branched_name: Forty Two +:current: 41 +:old_release: 40 diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 18856e4..9d45007 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -113,7 +113,7 @@ Cancel each of those tasks $ koji cancel ``` -== Repos to branch +== Repos that needs to be updated for branching All the following listed repos needs updating, including adding a new branch for branched release and updating rawhide branch with new release @@ -134,9 +134,32 @@ values. Now we need to update dist-git in two steps: * Create the new branch in git -* Update the gitolite.conf to allow user to push to this new branch +* Update the `gitolite.conf` to allow users to push to this new branch -For both of these actions you will need the file generated by pdc above. +For both of these actions, we need a file listing all **active** packages. +Previously, this was generated by **PDC**, but since **PDC is decommissioned**, +we now use a script to fetch active packages by filtering out retired and never-imported ones. + +=== Generate the Active Package List + +This script should be run in the **pkg machine**, which can be accessed via SSH from `batcave01.iad.fedoraproject.org`. + +``` +$ ssh batcave01.iad.fedoraproject.org +$ sudo ssh pkgs01.iad.fedoraproject.org # For production +$ sudo ssh pkgs01.stg.iad.fedoraproject.org # For testing +``` + +Before running the script, you need to **obtain the script from the Fedora RelEng repository**. You can do this in one of two ways: + +**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 +``` + +This will generate the file components_f{branched}.txt, which contains all valid, active, and imported packages, prefixed with rpm/. === Create the git branches @@ -596,50 +619,6 @@ https://gitlab.com/redhat/centos-stream/ci-cd/distrosync/distrobuildsync-config/ Branch new fedora rawhide in https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/koschei/#_branching_a_new_fedora_release[koschei]. -== Fedora Container Base Image - -In order to enable builds for Container Base Images via the -https://docs.pagure.org/releng/layered_image_build_service.html[Fedora -Layered Image Build System] we will need to import a new image for -Rawhide as well as for the new `fedora:rawhide` and `fedora:$\{RAWHIDE}` -tags. - -Check for the latest successful Rawhide Base Image composed image -https://koji.fedoraproject.org/koji/packageinfo?packageID=21546[here]. - -On `compose-x86-01.phx2` run: - -[source,bash,subs="attributes"] ----- -# Update this to be the correct URL for your image -$ BASEIMAGE_URL="https://kojipkgs.fedoraproject.org//packages/Fedora-Docker-Base/Rawhide/20170310.n.0/images/Fedora-Docker-Base-Rawhide-20170310.n.0.x86_64.tar.xz" - -# Update this to whatever version number Rawhide now points to -$ RAWHIDE="{rawhide}" - -# Load the latest, find it's image name -$ sudo docker load < <(curl -s "$\{BASEIMAGE_URL}") -$ sudo docker images | grep base-rawhide -fedora-docker-base-rawhide-20170310.n.0.x86_64 latest ffd832a990ca 5 hours ago 201.8 MB - -# Tag everything -$ sudo docker tag fedora-docker-base-rawhide-20170310.n.0.x86_64 candidate-registry.fedoraproject.org/fedora:rawhide -$ sudo docker tag fedora-docker-base-rawhide-20170310.n.0.x86_64 candidate-registry.fedoraproject.org/fedora:$\{RAWHIDE} -$ sudo docker tag fedora-docker-base-rawhide-20170310.n.0.x86_64 registry.fedoraproject.org/fedora:rawhide -$ sudo docker tag fedora-docker-base-rawhide-20170310.n.0.x86_64 registry.fedoraproject.org/fedora:$\{RAWHIDE} - -# Push the images -$ sudo docker push candidate-registry.fedoraproject.org/fedora:rawhide -$ sudo docker push candidate-registry.fedoraproject.org/fedora:$\{RAWHIDE} -$ sudo docker push registry.fedoraproject.org/fedora:rawhide -$ sudo docker push registry.fedoraproject.org/fedora:$\{RAWHIDE} - -# Clean up after ourselves -$ sudo docker rmi fedora-docker-base-rawhide-20170310.n.0.x86_64 -Untagged: fedora-docker-base-rawhide-20170310.n.0.x86_64:latest -$ for i in $(sudo docker images -q -f 'dangling=true'); do sudo docker rmi $i; done ----- - [NOTE] ==== Temporarily disable the rawhide cron job during branching PRs to ensure a branched compose is created. Re-enable rawhide after this.