Infrastructure/infra-docs-fpo
3
0
Fork 0
Code Issues 100 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Add variables to the docs

Browse source 
Signed-off-by: Diego Herrera <dherrera@redhat.com>
This commit is contained in:
Diego Herrera 2025-03-10 14:21:08 -03:00
parent 9fae8c3114
commit e8665e2e70
2 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/release_guide/pages/_partials/attributes.adoc
View file

@ -6,3 +6,6 @@
:branched_name: Forty Two :branched_name: Forty Two
:current: 41 :current: 41
:old_release: 40 :old_release: 40
:epel_major: 10
:epel_branched: 10.1
:epel_current: 10.0

64
modules/release_guide/pages/sop_epel_minor_mass_branching.adoc
View file

@ -4,7 +4,7 @@ include::_partials/attributes.adoc[]
== Description == Description
Originally, the EPEL repository had packages that built against the latest RHEL minor, but since EPEL10, the EPEL repository now builds against the latest Centos Stream release. To keep consistency for RHEL releases, EPEL repository goes through a mass branching process to generate a new minor release branch. This process let's the developers continue to maintain their packages against Centos Stream without risking to break packages that already work on the current active RHEL minor target. Originally, the EPEL repository had packages that built against the latest RHEL minor, but since EPEL{epel_major}, the EPEL repository now builds against the latest Centos Stream release. To keep consistency for RHEL releases, EPEL repository goes through a mass branching process to generate a new minor release branch. This process let's the developers continue to maintain their packages against Centos Stream without risking to break packages that already work on the current active RHEL minor target.
== Send announcement == Send announcement
@ -17,13 +17,13 @@ In Fedora it is recommended to https://docs.fedoraproject.org/en-US/infra/releas
But it was https://pagure.io/infra-docs-fpo/pull-request/357[decided not to require it] for this process. But it was https://pagure.io/infra-docs-fpo/pull-request/357[decided not to require it] for this process.
==== ====
=== Cancel all running build for EPEL10 === Cancel all running build for EPEL{epel_major}
List all running tasks and select only those relevant for current branching. List all running tasks and select only those relevant for current branching.
[source,bash,subs="attributes"] [source,bash,subs="attributes"]
---- ----
$ koji list-builds --state=0 --type=rpm | grep epel10 | awk '{print $1}' $ koji list-builds --state=0 --type=rpm | grep epel{epel_major} | awk '{print $1}'
---- ----
Cancel each of those tasks Cancel each of those tasks
@ -38,17 +38,17 @@ Now we need to update dist-git in two steps:
* Create the new branch in git * Create the new branch in git
For both of these actions you will need the list of active repos in EPEL10. For both of these actions you will need the list of active repos in EPEL{epel_major}.
=== Get current EPEL active packages === Get current EPEL active packages
To get the list of all the current active packages, you must run the `scripts/branching-epe/get_all_active_packages_branching.sh` script. To get the list of all the current active packages, you must run the `scripts/branching-epe/get_all_active_packages_branching.sh` script.
``` ```
sh scripts/branching-epel/get_all_active_packages_branching.sh 10.1 sh scripts/branching-epel/get_all_active_packages_branching.sh {epel_branched}
``` ```
The results will be saved to the components_epel10.1.txt The results will be saved to the components_epel{epel_branched}.txt
=== Create the git branches === Create the git branches
@ -58,7 +58,7 @@ On `pkgs01.stg` (for testing) or `pkgs02` (for production), run:
$ sudo -u pagure python /usr/local/bin/mass-branching-git.py <new branch name> <input file> $ sudo -u pagure python /usr/local/bin/mass-branching-git.py <new branch name> <input file>
``` ```
Where `<new branch name>` will be like `epel10.<new minor>` and the Where `<new branch name>` will be like `epel{epel_branched}` and the
`<input file>` the path to the file generated in the previous step. `<input file>` the path to the file generated in the previous step.
== Ansible == Ansible
@ -93,7 +93,7 @@ Make sure that the SLAs are added, check https://pagure.io/fedora-infra/ansible/
=== Koji hub === Koji hub
Update the koji hub config to allow side tags for new koji epel10 minor (currently epel10.1) tag. Update the koji hub config to allow side tags for new koji epel{epel_major} minor (currently epel{epel_branched}) tag.
Please check the file `roles/koji_hub/templates/hub.conf.j2` from https://pagure.io/fedora-infra/ansible/c/9860fa89b5a9e223fc7a42299fa30a8ffdbfbd77[this PR] for your reference. Please check the file `roles/koji_hub/templates/hub.conf.j2` from https://pagure.io/fedora-infra/ansible/c/9860fa89b5a9e223fc7a42299fa30a8ffdbfbd77[this PR] for your reference.
@ -114,7 +114,7 @@ $ sudo rbac-playbook groups/mbs.yml -t mbs
== Koji == Koji
The koji build system needs to have some tag/target work done to handle 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 epel10 go. builds from the new branch and to update where builds from epel{epel_major} go.
Run Run
https://pagure.io/releng/blob/main/f/scripts/branching-epel/make-koji-release-tags[make-koji-release-tags] https://pagure.io/releng/blob/main/f/scripts/branching-epel/make-koji-release-tags[make-koji-release-tags]
@ -122,8 +122,8 @@ script in https://pagure.io/releng[pagure releng] repo
[NOTE] [NOTE]
==== ====
Make sure that things tagged on epel10.0-testing are tagged correctly. Make sure that things tagged on epel{epel_current}-testing are tagged correctly.
https://bodhi.fedoraproject.org/updates/?search=&status=pending&status=testing&releases=EPEL-10.0 https://bodhi.fedoraproject.org/updates/?search=&status=pending&status=testing&releases=EPEL-{epel_current}
==== ====
== Bodhi == Bodhi
@ -136,8 +136,8 @@ missing repos. The following commands should be run on
[source,bash,subs="attributes"] [source,bash,subs="attributes"]
---- ----
$ sudo ln -s /mnt/koji/compose/updates/empty-repo/ /mnt/koji/compose/updates/epel10.1-updates $ sudo ln -s /mnt/koji/compose/updates/empty-repo/ /mnt/koji/compose/updates/epel{epel_branched}-updates
$ sudo ln -s /mnt/koji/compose/updates/empty-repo/ /mnt/koji/compose/updates/epel10.1-updates-testing $ sudo ln -s /mnt/koji/compose/updates/empty-repo/ /mnt/koji/compose/updates/epel{epel_branched}-updates-testing
---- ----
=== Creating Empty Repos === Creating Empty Repos
@ -149,29 +149,29 @@ from https://pagure.io/releng[pagure releng] repo. This should be run on
[source,bash,subs="attributes"] [source,bash,subs="attributes"]
---- ----
$ sudo -u ftpsync sh scripts/branching-epel/create_empty_repos.sh 10.1 $ sudo -u ftpsync sh scripts/branching-epel/create_empty_repos.sh {epel_branched}
---- ----
=== Creating EPEL10.1 release === Creating EPEL{epel_branched} release
To create a new minor release in bodhi, you need to run: To create a new minor release in bodhi, you need to run:
[source,bash,subs="attributes"] [source,bash,subs="attributes"]
---- ----
$ bodhi releases create \ $ bodhi releases create \
--name "EPEL-10.1" \ --name "EPEL-{epel_branched}" \
--long-name "Fedora EPEL 10.1" \ --long-name "Fedora EPEL {epel_branched}" \
--version 10 \ --version {epel_major} \
--branch epel10 \ --branch epel{epel_major} \
--id-prefix FEDORA-EPEL \ --id-prefix FEDORA-EPEL \
--dist-tag epel10.1 \ --dist-tag epel{epel_branched} \
--stable-tag epel10.1 \ --stable-tag epel{epel_branched} \
--testing-tag epel10.1-testing \ --testing-tag epel{epel_branched}-testing \
--candidate-tag epel10.1-testing-candidate \ --candidate-tag epel{epel_branched}-testing-candidate \
--pending-signing-tag epel10.1-signing-pending \ --pending-signing-tag epel{epel_branched}-signing-pending \
--pending-testing-tag epel10.1-testing-pending \ --pending-testing-tag epel{epel_branched}-testing-pending \
--pending-stable-tag epel10.1-pending \ --pending-stable-tag epel{epel_branched}-pending \
--override-tag epel10.1-override \ --override-tag epel{epel_branched}-override \
--mail-template fedora_epel_legacy_errata_template \ --mail-template fedora_epel_legacy_errata_template \
--state current \ --state current \
--composed-by-bodhi \ --composed-by-bodhi \
@ -191,7 +191,7 @@ $ sudo systemctl restart fm-consumer@config.service bodhi-celery.service
=== Update block_retired.py script === Update block_retired.py script
https://pagure.io/releng/blob/main/f/scripts/block_retired.py[block_retired.py] https://pagure.io/releng/blob/main/f/scripts/block_retired.py[block_retired.py]
script in releng repo should be updated with EPEL10 release and also script in releng repo should be updated with EPEL{epel_major} release and also
branched release should be added to the script. branched release should be added to the script.
Please look at this Please look at this
@ -200,14 +200,14 @@ commit] as an example.
=== Updating MirrorManager === Updating MirrorManager
We need to update the mirrormanager so that it will point EPEL10 to the We need to update the mirrormanager so that it will point EPEL{epel_major} to the
new EPEL10 minor. new EPEL{epel_major} minor.
Please follow the instructions in the Please follow the instructions in the
https://pagure.io/fedora-infrastructure/issue/9239#comment-671446[fedora 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.
=== Branch new EPEL10 minor in Koschei === Branch new EPEL{epel_major} minor in Koschei
Branch new fedora EPEL10 minor in Branch new fedora EPEL{epel_major} minor in
https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/koschei/#_branching_a_new_fedora_release[koschei]. https://docs.fedoraproject.org/en-US/infra/sysadmin_guide/koschei/#_branching_a_new_fedora_release[koschei].