Line 102: | Line 102: | ||
<ol> | <ol> | ||
<li>Make sure there's a tag at the tip of the branch and therefore no work is lost: | <li>Make sure there's a tag at the tip of the branch and therefore no work is lost: | ||
<pre>git tag --contains release-X.W</pre> | <pre>git tag --contains origin/release-X.W</pre> | ||
This must output some tag (like ''vX.W.3''). Otherwise the branch contains commits which are not part of any tag.</li> | This must output some tag (like ''vX.W.3''). Otherwise the branch contains commits which are not part of any tag.</li> | ||
<li>Delete the local branch: | <li>Delete the local branch (if you have it): | ||
<pre>git branch -D release-X.W</pre></li> | <pre>git branch -D release-X.W</pre></li> | ||
<li>Delete the remote branch: | <li>Delete the remote branch: |
Revision as of 07:57, 5 August 2011
This page describes the process for tagging, building and deploying a new version of autoqa. This page assumes a basic understanding of rpm spec
file syntax and commands such as git
, mock
and yum
.
Numbering scheme
Each release has X.Y.Z identification denoting a major, a minor and a revision number:
- Major number is increased when AutoQA makes incompatible changes in its test API. (Not used currently, since no stable public API has been offered yet.)
- Minor number is increased when AutoQA adds new features.
- Revision number is increased when AutoQA adds new hotfixes, but no new features.
Pre-requisites
You must have AutoQA source code checked out with write access (ssh:// protocol, requires gitautoqa membership):
git clone ssh://git.fedorahosted.org/git/autoqa.git cd autoqa
Switch Git branch
All the changes must be done in a correct git branch.
- If you want to create a new X.Y.0 major or minor release, create a new release branch:
git checkout -b release-X.Y master
- If you want to create a new revision release X.Y.Z, switch to a corresponding existing release branch:
git checkout release-X.Y
and apply all hotfixes you have prepared.
Update autoqa.spec
and NEWS
Every new release must be mentioned in the rpm spec
file. We also want to provide high-level changes overview in the NEWS
file.
- Edit
autoqa.spec
by incrementing theVersion
and updating the%changelog
- Edit
NEWS
file and add a section for the new release. Document only the most important end-user visible changes. - Locally commit the changes
git commit autoqa.spec NEWS
Tag the release
The last commit (changing the autoqa.spec
file) must be tagged to mark the release.
- Tag the commit:
git tag vX.Y.Z
- Check that the tag was applied to the correct commit by inspecting:
git log --decorate=full
Cherry-pick to master
After you tag the release on the release branch, you will want to cherry-pick the autoqa.spec
change (now tagged with vX.Y.Z tag) into the master branch.
- Change to the master branch
git checkout master
- Cherry-pick the updated
autoqa.spec
changegit cherry-pick vX.Y.Z
Push changes to remote repository
It's time now to push all the changes to the shared remote origin repository.
- Push the release branch changes:
git push --tags origin release-X.Y
- If you modified the master branch (i.e. for major or minor releases), push it too:
git push --tags origin master
Upload tarball
Like many projects, the appropriate method to release a new version is by tarball. Once you have tagged the release, upload a new tarball using the following commands.
- Check-out the correct tag
git checkout vX.Y.Z
- Upload a new release tarball
make upload
Build a source RPM
With the tarball uploaded, it's time to package the new release as an RPM.
- Check-out the correct tag
git checkout vX.Y.Z
- Build a source package
make srpm
Build for applicable releases
With a source RPM created, it's time to build updated packages for any existing stable repositories. This includes Fedora 41, Fedora 40 and, depending on the time of release, potentially Fedora 39. Traditionally, this step would be handled by running the koji build --tag dist-f41-updates path/to/src.rpm
command. However, since autoqa
is not yet packaged and available in Fedora repositories, updates are built locally using mock
.
- Build packages using mock for Fedora, specify version using
DIST
variable. For possible values forDIST
, consult Packaging:DistTagmake mock DIST=.fc41
- Repeat the build procedure for all desired releases
Create updates
With packages built, it's time to submit them as updates. Traditionally, this step would be handled by using the bodhi update tool. However, since autoqa
is not yet packaged and available in official Fedora repositories, a custom package repository is used to deliver updates.
- Mirror the autoqa package repository locally
rsync -avz fedorapeople.org:/srv/repos/fedora-qa/autoqa ~/public_html/ ; cd autoqa/
- Add locally built packages to the desired repositories
./move-pkgs.sh path/to/autoqa.git/rpm-build/MOCK/*/*.rpm
- Update the yum repo metadata
./update-repos.sh
- Update remote repository with changes
rsync -avz ~/public_html/autoqa fedorapeople.org:/srv/repos/fedora-qa/
Cleanup tasks
Purging old release branches
If we are sure we will no longer work on older releases (e.g. before X.Y), we can also delete older release branches. If W < Y, then we can delete release-X.W:
- Make sure there's a tag at the tip of the branch and therefore no work is lost:
git tag --contains origin/release-X.W
This must output some tag (like vX.W.3). Otherwise the branch contains commits which are not part of any tag. - Delete the local branch (if you have it):
git branch -D release-X.W
- Delete the remote branch:
git push origin :release-X.W
The same goes for deleting older major branches (branches release-Q.Y where Q < X).