opendev/puppet-openstack_infra_spec_helper
Code Issues Proposed changes

Update for opendev

Browse Source 
Change-Id: I3bb5204207ffceb31ee7296d29f08db02d330b4a
This commit is contained in:
Monty Taylor 2019-04-20 14:12:36 +00:00
parent 1a84060c62
commit f0eedbfbab
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -11,6 +11,6 @@ Include this gem in your Gemfile:
``` ```
gem 'puppet-openstack_infra_spec_helper', gem 'puppet-openstack_infra_spec_helper',
:git => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper', :git => 'https://opendev.org/opendev/puppet-openstack_infra_spec_helper',
:require => false :require => false
``` ```

2
lib/puppet-openstack_infra_spec_helper/spec_helper_acceptance.rb
View File

@ -1,6 +1,6 @@
require 'beaker-rspec' require 'beaker-rspec'
SYSTEM_CONFIG='git.openstack.org/openstack-infra/system-config' SYSTEM_CONFIG='opendev.org/opendev/system-config'
def run_ansible(host) def run_ansible(host)
base_playbook = "#{ENV['HOME']}/src/#{SYSTEM_CONFIG}/playbooks/base.yaml" base_playbook = "#{ENV['HOME']}/src/#{SYSTEM_CONFIG}/playbooks/base.yaml"

8
run_unit_tests.sh
View File

@ -24,18 +24,18 @@ gem build puppet-openstack_infra_spec_helper.gemspec
# use puppet-openstackci to test the gem # use puppet-openstackci to test the gem
if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then
/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
https://git.openstack.org openstack-infra/puppet-openstackci https://opendev.org opendev/puppet-openstackci
else else
git clone https://git.openstack.org/openstack-infra/puppet-openstackci openstack-infra/puppet-openstackci git clone https://opendev.org/opendev/puppet-openstackci opendev/puppet-openstackci
fi fi
cd openstack-infra/puppet-openstackci cd opendev/puppet-openstackci
# Modify Gemfile to use local library and not the one on git # Modify Gemfile to use local library and not the one on git
# so we can actually test the current state of the gem. # so we can actually test the current state of the gem.
# Note this is largely belts and suspenders for local test runs. # Note this is largely belts and suspenders for local test runs.
# puppet-openstackci already attempts to determine if it is running # puppet-openstackci already attempts to determine if it is running
# under Zuul and will do the correct thing in that case. # under Zuul and will do the correct thing in that case.
sed -i "s/:git => 'https:\/\/git.openstack.org\/openstack-infra\/puppet-openstack_infra_spec_helper'}/:path => '..\/..'}/" Gemfile sed -i "s/:git => 'https:\/\/opendev.org\/opendev\/puppet-openstack_infra_spec_helper'}/:path => '..\/..'}/" Gemfile
# Install dependencies # Install dependencies
gem install bundler --no-rdoc --no-ri --verbose gem install bundler --no-rdoc --no-ri --verbose