openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Set --no-user-install in gem install 

Since --user-install was enabled by default in gem[1], we need to set
--no-user-install to make "gem install" refer GEM_HOME.

Closes-Bug: #1866176
[1] https://github.com/rubygems/rubygems/pull/2847

Change-Id: Id640ec2cb1012e99826cb990fb4995945183521d
(cherry picked from commit 3b266e9a36)
This commit is contained in:
Takashi Kajinami 2020-03-06 00:18:42 +09:00 committed by Tobias Urdin
parent 1512873b33
commit 8691833ac2
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/prepare-node-integration.yaml
View File

@ -36,7 +36,7 @@
shell:
cmd: |
ruby <<EOF
cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
cmd += ' -v 1.17.3'
end

10
playbooks/run-beaker-tests.yaml
View File

@ -46,7 +46,7 @@
export GEM_HOME=`pwd`/.bundled_gems
if [ -f Gemfile ]; then
ruby <<EOF
cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
cmd += ' -v 1.17.3'
end
@ -55,10 +55,10 @@
$GEM_HOME/bin/bundle install --without system_tests --retry 3
$GEM_HOME/bin/bundle exec rspec spec/acceptance
else
gem install rake -n ./.bundled_gems/
gem install beaker-rspec
gem install puppetlabs_spec_helper
./.bundled_gems/rake acceptance 2>&1
gem install rake -n ./.bundled_gems/ --no-user-instal
gem install beaker-rspec --no-user-install
gem install puppetlabs_spec_helper --no-user-install
./.bundled_gems/rake acceptance 2>&1 --no-user-install
fi
chdir: '{{ ansible_user_dir }}/workspace'
executable: /bin/bash

12
playbooks/run-lint-tests.yaml
View File

@ -21,7 +21,7 @@
export GEM_HOME=`pwd`/.bundled_gems
if [ -f Gemfile ]; then
ruby <<EOF
cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
cmd += ' -v 1.17.3'
end
@ -33,11 +33,11 @@
$GEM_HOME/bin/bundle exec rake metadata_lint 2>&1
fi
else
gem install rake -n ./.bundled_gems/ --no-ri --no-rdoc
gem install puppet-lint -n ./.bundled_gems/ --no-ri --no-rdoc
gem install metadata-json-lint -n ./.bundled_gems/ --no-ri --no-rdoc
gem install puppetlabs_spec_helper -n ./.bundled_gems/ --no-ri --no-rdoc
gem install puppet -n ./.bundled_gems/ --no-ri --no-rdoc
gem install rake -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
gem install puppet-lint -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
gem install metadata-json-lint -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
gem install puppetlabs_spec_helper -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
gem install puppet -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
./.bundled_gems/rake lint 2>&1
if [ -f metadata.json ]; then
./.bundled_gems/metadata-json-lint

2
playbooks/run-syntax-tests.yaml
View File

@ -6,7 +6,7 @@
mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems
ruby <<EOF
cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
cmd += ' -v 1.17.3'
end

2
playbooks/run-unit-tests.yaml
View File

@ -9,7 +9,7 @@
mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems
ruby <<EOF
cmd = 'gem install bundler --no-rdoc --no-ri --verbose'
cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then
cmd += ' -v 1.17.3'
end