Switch to queens

This changes the queens version of the spec helper to reference the
stable/queens branch

Change-Id: I17a627a00ed1b7f7ece968d228b3c0fbf52dfb5c
This commit is contained in:
Mohammed Naser
2018-02-20 19:37:06 -05:00
parent ace36b5ad9
commit 6625f9c75c
4 changed files with 4 additions and 3 deletions

View File

@@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/puppet-openstack_spec_helper.git
defaultbranch=stable/queens

View File

@@ -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/queens openstack/puppet-nova
fi
cd openstack/puppet-nova

View File

@@ -46,7 +46,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/queens #{repo}"
end
on host, "ZUUL_BRANCH=#{zuul_branch} PUPPET_MAJ_VERSION=#{puppet_maj_version} bash #{repo}/install_modules.sh"

View File

@@ -56,7 +56,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/queens #{repo}")
end
# Allow to a repository to have extra modules that are not
# in puppet-openstack-integration