From 91da59c5b4b7ca8f601a60c9a800cc98bf4d3e2c Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 28 Apr 2020 10:52:01 -0600 Subject: [PATCH] Switch to ussuri We've cut the stable branch so update all the helpers. Change-Id: I3a250d6c408efd3cf66050e62a3759b30697b26d --- functions | 2 +- lib/puppet-openstack_spec_helper/beaker_spec_helper.rb | 2 +- lib/puppet-openstack_spec_helper/rake_tasks.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functions b/functions index 10aecb9..91de709 100644 --- a/functions +++ b/functions @@ -13,7 +13,7 @@ install_gems() { [ ! -d openstack ] && mkdir openstack cp -R /home/zuul/src/opendev.org/openstack/puppet-nova openstack/puppet-nova 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 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 fdb4164..74a9fb2 100644 --- a/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb +++ b/lib/puppet-openstack_spec_helper/beaker_spec_helper.rb @@ -43,7 +43,7 @@ RSpec.configure do |c| on host, "mkdir openstack || true" on host, "cp -R /home/zuul/src/opendev.org/#{repo} #{repo}" else - on host, "git clone https://opendev.org/#{repo} #{repo}" + on host, "git clone https://opendev.org/#{repo} -b stable/ussuri #{repo}" end on host, "ZUUL_BRANCH=#{zuul_branch} PUPPET_MAJ_VERSION=#{puppet_maj_version} 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 8adf673..71cc129 100644 --- a/lib/puppet-openstack_spec_helper/rake_tasks.rb +++ b/lib/puppet-openstack_spec_helper/rake_tasks.rb @@ -57,7 +57,7 @@ task :spec_prep do sh("mkdir openstack || true") sh("cp -R /home/zuul/src/opendev.org/#{repo} #{repo}") else - sh("git clone https://opendev.org/#{repo} #{repo}") + sh("git clone https://opendev.org/#{repo} -b stable/ussuri #{repo}") end # Allow to a repository to have extra modules that are not # in puppet-openstack-integration