diff --git a/README.md b/README.md index 1a5d001f81..1671f15860 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Ansible Tower Tower provides a web-based user interface, REST API and task engine built on top of Ansible. -The current version under development is 2.0.0. +The current version under development is 2.1.0. Development releases always use the 'master' branch. @@ -21,6 +21,10 @@ Release schedule * 1.4.10, April 28, 2014. * 1.4.11, May 30, 2014. * 2.0.0, August 19, 2014 +* 2.0.1, September 4, 2014 +* 2.0.2, October 6, 2014 +* 2.0.3, November 14, 2014 +* 2.0.4, November 21, 2014 Any fixes should be applied on the appropriate release branch and be cherry-picked to master. diff --git a/docs/release_process.md b/docs/release_process.md index 059e8bb73c..73599aa673 100644 --- a/docs/release_process.md +++ b/docs/release_process.md @@ -1,21 +1,38 @@ Release Process =============== -This document describes the process of created and publishing an Ansible Tower release. +This document describes the process of creating and publishing an Ansible Tower release. Time for a release ------------------ -When the time comes for a release, the first step is to tag the release in git. +When the time comes for a release, the following steps will ensure a smooth and +successful release. + +1. Verify that the `__version__` variable has been updated in `awx/__init__.py`. + + __version__ = 'X.Y.Z' + +2. Update the rpm package changelog by adding a new entry to the file `packaging/rpm/ansible-tower.spec`. + +3. Update the debian package changelog by adding a new entry to the file `packaging/debian/changelog`. + +4. Tag and push the release to git. # git tag + # git push --tags + +5. Create and push a release branch to git. + + # git branch release_ + # git checkout release_ + # git push origin release_ Monitor Jenkins --------------- -Once tagged, [Jenkins](http://50.116.42.103/view/Tower/) will take care of the -following steps. The jenkins job -[Release_Tower](http://50.116.42.103/view/Tower/job/Release_Tower/) will detect -the recent tag, and initiate the `OFFICIAL=yes` build process. +Once tagged, one must launch the [Release_Tower](http://50.116.42.103/view/Tower/job/Release_Tower/) with the following parameters: +* `GIT_BRANCH=origin/tags/` +* `OFFICIAL=yes` The following jobs will be triggered: * [Build_Tower_TAR](http://50.116.42.103/view/Tower/)