diff --git a/build-package.sh b/build-package.sh index d78632860b..dbe76f51f5 100755 --- a/build-package.sh +++ b/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 - + diff --git a/docs/conf.py b/docs/conf.py index 5ce9d60b12..26ea38e617 100644 --- a/docs/conf.py +++ b/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. diff --git a/docs/pages/0070-release-notes.rst b/docs/pages/0070-release-notes.rst index 7f1ac30b9e..aa85ce84f3 100644 --- a/docs/pages/0070-release-notes.rst +++ b/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 diff --git a/docs/pages/release-notes/v0-1-0-essex.rst b/docs/pages/release-notes/v1-0-essex.rst similarity index 96% rename from docs/pages/release-notes/v0-1-0-essex.rst rename to docs/pages/release-notes/v1-0-essex.rst index e62f0da193..dda55c738b 100644 --- a/docs/pages/release-notes/v0-1-0-essex.rst +++ b/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 diff --git a/docs/pages/release-notes/v0-2-0-folsom.rst b/docs/pages/release-notes/v2-0-folsom.rst similarity index 96% rename from docs/pages/release-notes/v0-2-0-folsom.rst rename to docs/pages/release-notes/v2-0-folsom.rst index bd8c5b1a2b..8f64cb8ba8 100644 --- a/docs/pages/release-notes/v0-2-0-folsom.rst +++ b/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 diff --git a/publish-package.sh b/publish-package.sh index a83651ed39..0e5b533a64 100755 --- a/publish-package.sh +++ b/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 "