(1) new versioning for releases, (2) fixed script for building .tar.gz package

build-package.sh

@@ -22,16 +22,19 @@ rm -rf $build_dir
 mkdir $build_dir
 
 # checkout fuel into it
-git clone gitolite@gitolite.mirantis.com:fuel/fuel.git $build_dir
+git clone ssh://$(whoami)@gerrit.mirantis.com:29418/fuel/fuel-folsom.git $build_dir
 cd $build_dir
 git checkout $tag
-git submodule update --init
+
+# capture commit id
+commit=`git rev-parse HEAD`
 
 # remove git tracking
 rm -rf `find . -name ".git*"`
 
 # generate release version
 echo $tag > release.version
+echo $commit > release.commit
 
 # build documentation
 cd docs
@@ -45,8 +48,8 @@ cp -R docs/_build/html/* documentation/
 
 # create archive
 cd ..
-tar -czf $build_dir.tar.gz "$build_dir/deployment/" "$build_dir/documentation/" "$build_dir/release.version"
+tar -czf $build_dir.tar.gz "$build_dir/deployment/" "$build_dir/documentation/" "$build_dir/release.commit" "$build_dir/release.version"
 
 # remove build directory
 rm -rf $build_dir
- 
+

docs/conf.py

@@ -50,7 +50,7 @@ copyright = u'2012, Mirantis'
 # The short X.Y version.
 version = '1'
 # The full version, including alpha/beta/rc tags.
-release = '0.2'
+release = '2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/pages/0070-release-notes.rst

@@ -3,6 +3,6 @@ Release Notes
 
 .. contents:: :local:
 
-.. include:: release-notes/v0-2-0-folsom.rst
-.. include:: release-notes/v0-1-0-essex.rst
+.. include:: release-notes/v2-0-folsom.rst
+.. include:: release-notes/v1-0-essex.rst
 

docs/pages/release-notes/v1-0-essex.rst

@@ -1,5 +1,5 @@
 
-v0.1.0-essex
+v1.0-essex
 ------------
 
 * Puppet manifests for deploying OpenStack Essex in HA mode

docs/pages/release-notes/v2-0-folsom.rst

@@ -1,5 +1,5 @@
 
-v0.2.0-folsom
+v2.0-folsom
 -------------
 
 * Puppet manifests for deploying OpenStack Folsom in HA mode

publish-package.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+echo "This script is deprecated. We no longer publish fuel releases to download.mirantis.com"
+exit 0
+
 if [ ! $# == 1 ]; then
 
   echo "Usage: $0 <fuel-package-name.tar.gz>"