From 0aab9c47584a763c792f51cc54ed5da1cf22c7f8 Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Mar 02 2023 20:41:10 +0000 Subject: [sop-mass-branching] Add relevant commit references for mass_branching documentation Signed-off-by: Samyak Jain --- diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 549bf0d..c0e0384 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -96,7 +96,7 @@ Where `` will be something like `f28` and the ==== Ansible -Apps in ansible need to be updated to be aware of a new branch. +Apps in https://pagure.io/fedora-infra/ansible[ansible] need to be updated to be aware of a new branch. ===== Bodhi @@ -106,35 +106,50 @@ role] in infra ansible repo. This change includes, updating koji-sync-listener.py, new-updates-sync, pungi configs for both rpm and modular updates, bodhi templates. +.... +- roles/bodhi2/backend/files/new-updates-sync +- roles/bodhi2/backend/tasks/main.yml +- roles/bodhi2/backend/templates/pungi.module.conf.j2 +- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +- roles/bodhi2/backend/templates/koji_sync_listener.toml +.... + +Please check these files from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference. ===== Enable Branched Compose We need to enable the branched compose. This is done in https://pagure.io/fedora-infra/ansible/blob/main/f/roles/releng[releng -role] of infra ansbile repo +role] of infra ansbile repo. +Please check the file `roles/releng/files/branched` from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference. ===== Fedora Branched -Set FedoraBranched variable to True in infra ansible repo +. Set FedoraBranched variable to True in infra ansible repo. +. Set FedoraBranchedBodhi variable to preenable in infra ansible repo. +Please check the file `FedoraBranched.yaml` and `FedoraBranchedBodhi.yaml` from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference. ===== Koji hub +Update the koji hub config to allow side tags for new koji rawhide tag. + +Please check the file `roles/koji_hub/templates/hub.conf.j2` from the https://pagure.io/fedora-infra/ansible/c/549e5d3ace41c04fdbef9d81f359f16c2fe0c2fa?branch=main[commit] for your reference. ===== Robosignatory -Robosignatory has two parts: +Robosignatory has two parts, which can be found in +https://pagure.io/fedora-infra/ansible/blob/main/f/roles/robosignatory[robosignatory +role] in infra ansible repo.: [arabic] . Disable branched signing, so that we can freeze branched until we get -a compose -. Adding new release +a compose. +. Adding new release. -Both can be in -https://pagure.io/fedora-infra/ansible/blob/main/f/roles/robosignatory[robosignatory -role] in infra ansible repo +Please check the file `roles/robosignatory/templates/robosignatory.toml.j2` from the https://pagure.io/fedora-infra/ansible/c/a7dcdbd794e728f7b80b1afc6c142c0196b8c1a3?branch=main[commit] for your reference. ===== Push the changes @@ -166,7 +181,9 @@ script in https://pagure.io/releng[pagure releng] repo The `fedora-release` package needs to be updated in Rawhide and Branched. -Changes to `fedora-release.spec` in the *rawhide* branch: +Changes to `fedora-release.spec` in the *rawhide* branch: + +(can also check this https://src.fedoraproject.org/rpms/fedora-release/c/841f1fb8e5f7ff2b11a5e0905f15e765da405edd?branch=rawhide[commit] for reference) [arabic] . Increment `%define dist_version`: @@ -191,7 +208,9 @@ Changes to `fedora-release.spec` in the *rawhide* branch: +- Setup for rawhide being F36 .... -Changes to `fedora-release.spec` in the *branched* branch: +Changes to `fedora-release.spec` in the *branched* branch: + +(can also check this https://src.fedoraproject.org/rpms/fedora-release/c/a2c289b44335eec89efaddee02d807b048edd51f?branch=f37[commit] for reference) [arabic] . Adjust `release_name` and unset `is_rawhide`: @@ -230,6 +249,8 @@ and updated symlinks). Changes to the *rawhide* branch (mostly in `fedora-repos.spec`): +(can also check this https://src.fedoraproject.org/rpms/fedora-repos/c/043010400f007c9f7167c9411d4463f4c2f08b9e?branch=rawhide[commit] for reference) + [arabic] . Generate and add a _Rawhide+1_ GPG key file, then add it to the spec file: @@ -266,6 +287,8 @@ Source57: RPM-GPG-KEY-fedora-37-primary Changes to the *branched* branch (mostly in `fedora-repos.spec`): +(can also check this https://src.fedoraproject.org/rpms/fedora-repos/c/cd678e7b4aa59e234f32c9697198f58d9c89d862?branch=f38[commit] for reference) + [arabic] . Copy the _Rawhide+1_ GPG key file from the _rawhide_ branch, then add it to the spec file: @@ -280,7 +303,7 @@ Source57: RPM-GPG-KEY-fedora-37-primary -%global rawhide_release 35 +%global rawhide_release 36 .... -. Enable `updates_testing_enabled`: +. Enable `updates_testing_enabled`: + .... -%global updates_testing_enabled 0