openstack/puppet-openstack_spec_helper
Code Issues Proposed changes

Merge "Switch to ussuri" into stable/ussuri

Browse Source
This commit is contained in:
Zuul
2020-05-08 14:55:03 +00:00
committed by Gerrit Code Review
parent dac1a4b016 91da59c5b4
commit b91a4f8bd5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
functions
View File

@@ -13,7 +13,7 @@ install_gems() {
[ ! -d openstack ] && mkdir openstack [ ! -d openstack ] && mkdir openstack
cp -R /home/zuul/src/opendev.org/openstack/puppet-nova openstack/puppet-nova cp -R /home/zuul/src/opendev.org/openstack/puppet-nova openstack/puppet-nova
else else
git clone https://opendev.org/openstack/puppet-nova openstack/puppet-nova git clone https://opendev.org/openstack/puppet-nova -b stable/ussuri openstack/puppet-nova
fi fi
cd openstack/puppet-nova cd openstack/puppet-nova

2
lib/puppet-openstack_spec_helper/beaker_spec_helper.rb
View File

@@ -43,7 +43,7 @@ RSpec.configure do |c|
on host, "mkdir openstack || true" on host, "mkdir openstack || true"
on host, "cp -R /home/zuul/src/opendev.org/#{repo} #{repo}" on host, "cp -R /home/zuul/src/opendev.org/#{repo} #{repo}"
else else
on host, "git clone https://opendev.org/#{repo} #{repo}" on host, "git clone https://opendev.org/#{repo} -b stable/ussuri #{repo}"
end end
on host, "ZUUL_BRANCH=#{zuul_branch} PUPPET_MAJ_VERSION=#{puppet_maj_version} bash #{repo}/install_modules.sh" on host, "ZUUL_BRANCH=#{zuul_branch} PUPPET_MAJ_VERSION=#{puppet_maj_version} bash #{repo}/install_modules.sh"

2
lib/puppet-openstack_spec_helper/rake_tasks.rb
View File

@@ -57,7 +57,7 @@ task :spec_prep do
sh("mkdir openstack || true") sh("mkdir openstack || true")
sh("cp -R /home/zuul/src/opendev.org/#{repo} #{repo}") sh("cp -R /home/zuul/src/opendev.org/#{repo} #{repo}")
else else
sh("git clone https://opendev.org/#{repo} #{repo}") sh("git clone https://opendev.org/#{repo} -b stable/ussuri #{repo}")
end end
# Allow to a repository to have extra modules that are not # Allow to a repository to have extra modules that are not
# in puppet-openstack-integration # in puppet-openstack-integration