RDO community repositories by redhat-openstack

edit (theme=minimal)

This organisation is used to group repositories related to the management of RDO community maintained OpenStack packages for Fedora, Red Hat Enterprise Linux and derivatives.

The repositories named openstack-* contain the packaging files related to the trunk tracking smokestack project. The rest are forks of the OpenStack projects themselves, allowing us to use git to manipulate the changes, with the patches within the packages being automatically generated from the git repositories.

Following are the steps to use this workflow:

New redhat-openstack project setup

Fork $project to redhat-openstack organisation
fedpkg clone openstack-$project && cd openstack-$project
git remote add -f redhat-openstack git@github.com:redhat-openstack/$project.git
git checkout redhat-openstack/master
git checkout -b master-patches # New local branch
git push --set-upstream redhat-openstack master-patches # New upstream branch
On github set master-patches branch to default
git push redhat-openstack :master # Delete upstream master branch (and any other unneeded branches)

setup local repo for a $project (if someone else set it up on github)

fedpkg clone openstack-$project && cd openstack-$project
git remote add -f redhat-openstack git@github.com:redhat-openstack/$project.git
git branch master-patches redhat-openstack/master-patches

finish setup of local repo

git remote add -f openstack git://github.com/openstack/$project.git
git remote add -f redhat-smokestack git@github.com:redhat-openstack/openstack-$project.git
wget https://raw.github.com/redhat-openstack/redhat-openstack.github.com/scripts/update-patches.sh

The above steps are only needed once to setup your local repo. The following are needed each time you want to update a package:

Patch set update process

Ensure all repos are up to date locally:

git fetch --all --tags
git fetch --all

Rebase specific patches on top of the OpenStack tree:

git checkout master-patches
git log --oneline # Identify hash of commit before first commit to consider rebasing

You can either rebase the patch branch onto a branch:

git rebase --onto remotes/openstack/stable/$release $hash or a tag:
git rebase --onto $tag $hash

Use the --interactive rebase option if want to edit/delete commits etc. Also you can git cherry-pick other patches from remotes/openstack/master for example, or directly from gerrit by copy and pasting the cherry-pick commands from there.

Update the patches on master

git checkout master
git pull origin
# Ensure the patches_base line is set appropriately in the spec file
./update-patches.sh

Update changelog and version in spec file as appropriate and push to the repo

git commit --amend -a
git push

Push updated master-patches back to redhat-openstack. I.E. to github so everyone is synced.

git push --tags redhat-openstack +master-patches Note the + above, which will force sync (so there needs to be a little coordination between packagers)

Note a separate branch is not maintained on github until needed. For example if Fedora 19 has the same patches as rawhide, then just git merge those branches in the Fedora project git repositories.