From 5901b7d1a3e26dadf4c122fb0c42fce4f1626c18 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 21 Mar 2016 15:16:49 -0400 Subject: [PATCH] Release 8.0.0 * Update CHANGELOG file to document the right URL for release notes. * Update beaker_spec_helper and rake_tasks to checkout stable/mitaka. * Update version in version.rb, to match with other modules versionning. * Improve index.rst to list releases and propose indices and tables. * Add mitaka.rst to track notes added in stable/mitaka. * Update .gitreview Change-Id: I9eedb76279e5f2bf61b7819c55433b1393d312aa (cherry picked from commit 4150a405cac1939b1978c2c023f329ff98681c07) --- .gitreview | 1 + CHANGELOG.md | 2 ++ functions | 2 +- .../beaker_spec_helper.rb | 2 +- .../rake_tasks.rb | 2 +- lib/puppet-openstack_spec_helper/version.rb | 2 +- releasenotes/source/index.rst | 19 +++++++++++++++---- releasenotes/source/mitaka.rst | 6 ++++++ 8 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 releasenotes/source/mitaka.rst diff --git a/.gitreview b/.gitreview index e425b35..43a174a 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.openstack.org port=29418 project=openstack/puppet-openstack_spec_helper.git +defaultbranch=stable/mitaka diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29..7dc8ce9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +Release notes are published on +[docs.openstack.org](http://docs.openstack.org/releasenotes/puppet-openstack_spec_helper/). diff --git a/functions b/functions index c6dfd96..15fc685 100644 --- a/functions +++ b/functions @@ -12,7 +12,7 @@ install_gems() { /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ git://git.openstack.org openstack/puppet-nova else - git clone git://git.openstack.org/openstack/puppet-nova openstack/puppet-nova + git clone git://git.openstack.org/openstack/puppet-nova -b stable/mitaka openstack/puppet-nova fi cd openstack/puppet-nova diff --git a/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb b/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb index 1feb632..c0741ee 100644 --- a/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb +++ b/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb @@ -49,7 +49,7 @@ RSpec.configure do |c| zuul_clone_cmd += "git://git.openstack.org #{repo}" on host, zuul_clone_cmd else - on host, "git clone https://git.openstack.org/#{repo} #{repo}" + on host, "git clone https://git.openstack.org/#{repo} -b stable/mitaka #{repo}" end on host, "ZUUL_REF=#{zuul_ref} ZUUL_BRANCH=#{zuul_branch} ZUUL_URL=#{zuul_url} bash #{repo}/install_modules.sh" diff --git a/lib/puppet-openstack_spec_helper/rake_tasks.rb b/lib/puppet-openstack_spec_helper/rake_tasks.rb index 7b889a9..2f2af21 100644 --- a/lib/puppet-openstack_spec_helper/rake_tasks.rb +++ b/lib/puppet-openstack_spec_helper/rake_tasks.rb @@ -59,7 +59,7 @@ task :spec_prep do zuul_clone_cmd += ['git://git.openstack.org', "#{repo}"] sh(*zuul_clone_cmd) else - sh("git clone https://git.openstack.org/#{repo} #{repo}") + sh("git clone https://git.openstack.org/#{repo} -b stable/mitaka #{repo}") end script = ['env'] script += ["PUPPETFILE_DIR=#{Dir.pwd}/spec/fixtures/modules"] diff --git a/lib/puppet-openstack_spec_helper/version.rb b/lib/puppet-openstack_spec_helper/version.rb index d2e93bb..6f4ca80 100644 --- a/lib/puppet-openstack_spec_helper/version.rb +++ b/lib/puppet-openstack_spec_helper/version.rb @@ -1,5 +1,5 @@ module PuppetOpenstackSpecHelper module Version - STRING = '0.0.1' + STRING = '8.0.0' end end diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 8a0bcd3..bd50144 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -1,8 +1,19 @@ -========================================== -puppet-openstack_spec_helper Release Notes -========================================== +====================================================== +Welcome to puppet-openstack_spec_helper Release Notes! +====================================================== + +Contents +======== .. toctree:: - :maxdepth: 1 + :maxdepth: 2 + mitaka unreleased + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`search` diff --git a/releasenotes/source/mitaka.rst b/releasenotes/source/mitaka.rst new file mode 100644 index 0000000..05ed3e4 --- /dev/null +++ b/releasenotes/source/mitaka.rst @@ -0,0 +1,6 @@ +=========================== +Mitaka Series Release Notes +=========================== + +.. release-notes:: + :branch: origin/stable/mitaka