Mass Branching SOP

From FedoraProject

Jump to: navigation, search
This page is deprecated
All Fedora Release Engineering Documentation has moved here with source hosted along side the code in the releng pagure repository



At each alpha freeze we branch the pending release away from devel/ which allows rawhide to move on while the pending release goes into bugfix and polish mode.


Turn off auto-update of the git repos

The first step of the mass-branching is to turn off `fedmsg-hub` on

Usually, git repositories are automatically updated when something happens in pkgdb. For example, when a new branch is added in pkgdb, the git repo automatically gets a new branch created, and during the regular business hours, this new branch points to the very first commit in the repo allowing to merge any other branch into this new one.

When we do mass-branching, we want the new branch to point to the last commit in `master`, so we need to stop automatically updating the git repos.

For this, simply log on to ```` and stop the fedmsg-hub service:

systemctl stop fedmsg-hub


Mass branching in the pkgdb is the second step. It should be done near the time that the scm branches are created so as not to confuse packagers. However, it does not cause an outage so it could be done ahead of time.

The action on pkgdb is in a few steps:

  1. Edit the dist-tag of `master` collection in PackageDB (to avoid having conflicting koji tags),
  2. Create the new collection via the Admin interface of pkgdb, for Fedora Branched the status should be set to Under Development until the Final Freeze is reached. This allows to retire packages until then.
  3. On one of the pkgdb host (ie: pkgdb01 or pkgdb02 or pkgdb01.stg if you want to try on staging first), call the script
sudo f21 --user=<fas_user> --groups=<fas_group_allowed>

fas_user corresponds to the FAS username of the admin doing the action.

fas_group_allowed corresponds to a FAS group allowed to perform admin actions (ie: ADMIN_GROUP in the pkgdb configuration file)

The mass branch process starts on the server and will last for ~1h45

When the branching is finished, the email address defined at MAIL_ADMIN in the configuration file will receive an email that tells which were branched and which were unbranched.

If something fails spectacularly, it is safe to try mass branching again at a later time. If only a few cleanups a re needed it might be better to do that with the regular branch commands.


A couple files under puppet management need to be updated to be aware of a new branch.

This file is used by an scmadmin to read data from pkgdb and create branches in the source control. Two parts need to be updated, one part that defines valid branches and what existing branch to create them from, and the other part defines a mapping of branch names in pkgdb to branch names in scm.

On the puppet server in a clone edit the modules/gitolite/files/distgit/ file:

diff --git a/modules/gitolite/files/distgit/ b/modules/gitolite/file
index ce79467..c40e83c 100755
--- a/modules/gitolite/files/distgit/
+++ b/modules/gitolite/files/distgit/
@@ -29,14 +29,15 @@ BRANCHES = {'el4': 'master', 'el5': 'master', 'el6': 'f12',
         'f11': 'master',
         'f12': 'master',
         'f13': 'master',
-        'f14': 'master'}
+        'f14': 'master',
+        'f15': 'master'}
 # The branch names we get out of pkgdb have to be translated to git
 GITBRANCHES = {'EL-4': 'el4', 'EL-5': 'el5', 'EL-6': 'el6', 'OLPC-2': 'olpc2',
                'FC-6': 'fc6', 'F-7': 'f7', 'F-8': 'f8', 'F-9': 'f9',
                'F-10': 'f10', 'OLPC-3': 'olpc3',
                'F-11': 'f11', 'F-12': 'f12', 'F-13': 'f13', 'f14': 'f14',
-               'devel': 'master'}
+               'f15': 'f15', 'devel': 'master'}


The other file is ran by cron that will read data out of pkgdb and construct an ACL config file for our scm. It has a section that lists active branches to deal with as pkgdb will provide data for all branches.

Again on the ansible server in a clone: modules/gitolite/files/distgit/genacls.pkgdb

diff --git a/modules/gitolite/files/distgit/genacls.pkgdb b/modules/gitolite/files/
index e531dc2..07b2ba7 100755
--- a/modules/gitolite/files/distgit/genacls.pkgdb
+++ b/modules/gitolite/files/distgit/genacls.pkgdb
@@ -22,7 +22,7 @@ if __name__ == '__main__':
     ACTIVE = {'OLPC-2': 'olpc2/', 'OLPC-3': 'olpc3/', 'EL-4': 'el4/',
               'EL-5': 'el5/', 'EL-6': 'el6/', 'F-11': 'f11/',
               'F-12': 'f12/', 'F-13': 'f13/', 'f14': 'f14/',
-              'devel': 'master'}
+              'f15': 'f15/', 'devel': 'master'}
     # Create a "regex"ish list 0f the reserved branches


There is a file in the fedora-packages webapp source that needs to be updated with new releases. It tells fedora-packages what tags to ask koji about. Just like before, make the following edit in puppet in a clone:

diff --git a/modules/packages/files/ b/modules/packages/files/
index c72fd4b..b1fbaa5 100644
--- a/modules/packages/files/
+++ b/modules/packages/files/
@@ -1,5 +1,9 @@
 # Global list of koji tags we care about
-tags = ({'name': 'Rawhide', 'tag': 'f20'},
+tags = ({'name': 'Rawhide', 'tag': 'f21'},
+        {'name': 'Fedora 20', 'tag': 'f20-updates'},
+        {'name': 'Fedora 20', 'tag': 'f20'},
+        {'name': 'Fedora 20 Testing', 'tag': 'f20-updates-testing'},
         {'name': 'Fedora 19', 'tag': 'f19-updates'},
         {'name': 'Fedora 19', 'tag': 'f19'},
@@ -13,10 +17,6 @@ tags = ({'name': 'Rawhide', 'tag': 'f20'},
         {'name': 'Fedora 17', 'tag': 'f17'},
         {'name': 'Fedora 17 Testing', 'tag': 'f17-updates-testing'},
-        {'name': 'Fedora 16', 'tag': 'f16-updates'},
-        {'name': 'Fedora 16', 'tag': 'f16'},
-        {'name': 'Fedora 16 Testing', 'tag': 'f16-updates-testing'},
         {'name': 'EPEL 6', 'tag': 'dist-6E-epel'},
         {'name': 'EPEL 6', 'tag': 'dist-6E-epel-testing'},

Push the changes

When done editing the files, commit and push them, then run the `pkgs.yml` playbook in order to get the new files in place.


The following work is performed on pkgs01


Edit `/usr/local/bin/` and do the following change: (Around line 67)

- MKBRANCH = '/usr/local/bin/mkbranch'
+ MKBRANCH = '/usr/local/bin/mkbranch_branching'

Update ACLs

Update the git repos manually

$ sudo -u jkeating /usr/local/bin/

Undo changes to

Edit `/usr/local/bin/` and undo the changes made above: (Around line 67)

+ MKBRANCH = '/usr/local/bin/mkbranch'
- MKBRANCH = '/usr/local/bin/mkbranch_branching'

Turn back on the auto-update for the git repos

On ```` restart ``fedmsg-hub`` so:

systemctl start fedmsg-hub


File a Taskotron ticket and ask for the newly branched release support to be added. (Log in to Phabricator using your email address).


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 master go. See the section on Koji in the Adding Build Targets SOP for details.

Fedora Release

The Fedora release package needs to be updated in both the new branch and in master. FIXME Link to fedora release bump SOP


Bodhi needs to be turned on for the new branch. Instructions in the Bodhi SOP

Enable nightly branched compose

A cron job needs to be modified and turned on for the new branch. FIXME Link to nightly branched SOP

Update kickstart used by nightly live ISOs

On a nightly basis, a live ISO image is created for each spin and hosted at The dnf|yum repositories used by spin-kickstarts need to be updated to use the branched repository. Please file a rel-eng ticket to request updating the kickstart file used to generate the nightly spin ISO's.


A new comps file needs to be created for the next fedora release (the one after what we just branched for). FIXME Link to comps SOP


Mock needs to be updated to have configs for the new branch. This should actually be done and pushed just before the branch event. FIXME Link to mock update SOP


Mirror manager will have to be updated so that the dnf|yum repo redirections are going to the right places. FIXME Link to MM SOP

Update critpath

Packagedb has information about which packages are critpath and which are not. A script that reads the dnf|yum repodata (critpath group in comps, and the package dependencies) is used to generate this. Read the Update Critpath SOP for the steps to take.

Consider Before Running