From 2c9f7a7192b4d9120bedbae83b729ff70d0c33b7 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jul 09 2025 13:10:31 +0000 Subject: docs/policies/branches: Refresh Hyperscale branch policies This documents the new convention followed with the move to the CentOS GitLab.com group. --- diff --git a/docs/policies/branches.md b/docs/policies/branches.md index 5848eb7..c7224a7 100644 --- a/docs/policies/branches.md +++ b/docs/policies/branches.md @@ -1,13 +1,36 @@ # Branches in CentOS -The convention on [git.centos.org](https://git.centos.org) is for packages to have a branch per major CentOS version, so you get `c7`, `c8-beta`, `c8`, etc. These branches host the [source delivery](https://github.com/CentOS/sync2git) from the corresponding RHEL version. +The convention on [the Red Hat CentOS Stream GitLab](https://gitlab.com/redhat/centos-stream) is for packages +to have a branch per major CentOS Stream version, so you get `c9s`, `c10s`, etc. These branches host the sources +for CentOS and Red Hat Enterprise Linux (RHEL). -Packages in CentOS Stream 8 have a `c8s` branch, and that's the one you want to look at in the vast majority of cases. Likewise, packages in CentOS Stream 9 have a `c9s` branch; this branch is however hosted on [GitLab](https://gitlab.com/redhat/centos-stream/rpms), not on git.centos.org. +## Special note about (Modular) Application Streams +Packages shipped as part of module streams can have additional branches, usually named `-stream-`. +For example, the [softhsm](https://gitlab.com/redhat/centos-stream/rpms/softhsm) package has a `c8s-stream-DL1 branch`, +signifying it is shipped as part of the `DL1` module stream (of the `idm` module, in this case). On a running system, +`dnf module provides softhsm` would also point out the origin of this package. -Packages shipped as part of module streams can have additional branches, usually named `-stream-`. For example, the [softhsm](https://git.centos.org/rpms/softhsm) package has a `c8s-stream-DL1 branch`, signifying it is shipped as part of the `DL1` module stream (of the `idm` module, in this case). On a running system, `dnf module provides softhsm` would also point out the origin of this package. -In general, a CentOS SIG will have push access to all branches named `cXs-sig-*`. # Branches in Hyperscale -Packages in the Hyperscale SIG should be maintained in a `cXs-sig-hyperscale` branch, where `cXs` refers to the CentOS Stream version (e.g. `c8s` for CentOS Stream 8). In the past, we also used `cXs-sig-hyperscale-experimental` branches for packages targeting the [experimental repository](../content/repositories/experimental.md). These are deprecated and will be removed once all packages have been migrated to the current convention. +CentOS Hyperscale is maintained on [the CentOS GitLab](https://gitlab.com/CentOS). Packages are maintained in the [`Hyperscale/rpms`](https://gitlab.com/CentOS/Hyperscale/rpms) +group in GitLab. + +Hyperscale branches are maintained in `cXs-`, where `cXs` refers to the CentOS Stream version (e.g. `c10s` for CentOS Stream 10), +and `` refers to the Hyperscale SIG tag it was built for. Below is a table explaining the relationship. + +| Hyperscale tag | Variant tag | +|----------------|-------------| +| main | hs | +| spin | hs-spin | +| experimental | hsx | +| kernel | hsk | +| asahi | hs+asahi | +| gnome | hs+gnome | +| facebook | hs+fb | +| intel | hs+intel | + +Some older packages may follow the legacy conventional `cXs-sig-hyperscale` branch model. +In the further past, we also used `cXs-sig-hyperscale-experimental` branches for packages targeting the [experimental repository](../content/repositories/experimental.md). +These are deprecated and will be removed once all packages have been migrated to the current convention.