From 16216d271cb49ca4e47d61033093038f7f4ea974 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Jun 15 2022 14:01:27 +0000 Subject: docs: Add new docs on pagure specific steps for a new systemd release --- diff --git a/docs/internal/systemd.md b/docs/internal/systemd.md index e8d2283..9e74f2a 100644 --- a/docs/internal/systemd.md +++ b/docs/internal/systemd.md @@ -26,12 +26,30 @@ Steps: * If you think your PR from upstream will apply cleanly, you can download it and `git am ` it directly. Otherwise you can use `git cherry-pick` and manual edits to ensure your change will build. * At minimum, do a `meson test` to ensure unit tests pass. + * If you're backporting an upstream commit, update the BACKPORTS file with a link to the changes you're backporting * Open a PR against [centos-sig-hyperscale/systemd](https://pagure.io/centos-sig-hyperscale/systemd) with your change. * In the PR, include a link to your PR from systemd upstream. - * Tag anitazha for reviews. + * Tag anitazha/daandemeyer for reviews. * Once merged, one of the systemd Hyperscale maintainers will update the RPM spec and publish a new version of systemd for Hyperscale with the patches. +# Preparing a new release in the Staging Repo + +- Run `create_or_checkout_release_branch.sh` from the systemd-releng repo. Pass the name of the systemd stable release you want to + base the new Hyperscale release on as an argument (e.g. `./create_or_checkout_release_branch.sh 250.3`). This will push two new + release branches to the pagure repository, one for the general Hyperscale release, one for the Meta specific release. +- Look at the BACKPORTS file for the backports done for the previous release, find out which are still relevant for the next release + and backport those changes to the new release branches. First, do the backports for the Hyperscale release branch, then merge the + Hyperscale release branch into the Meta specific release branch and then do any Meta specific backports. +- Add new entries to the BACKPORTS file for the new release branches, along with links to all the backports. +- Push the branches to the pagure remote. +- When backporting PRs that haven't been merged upstream yet, update systemd-git-update and systemd-cd in the systemd-releng + repository as well. Update systemd-git-update to pull the upstream PR and mirror it to a branch on the pagure remote. Update + systemd-cd to merge the mirror branch into the main branch when running the CI. + +The new release branches are now ready to be used in the RPM spec. See the next +section on how to do a new release for the RPM spec. + # Contributing to the RPM spec / New Version Updates in the SIG Make sure you're [onboarded](https://sigs.centos.org/hyperscale/internal/onboarding/) onto the SIG before following these steps.