openstack/puppet-openstack-integration
Code Issues Proposed changes

pin bundler to 2.2.11

Browse Source 
It seems the latest 2.2.12 requires rake>13.0 installed and that
requirement doesn't work well in current our CI jobs.
Let's pin it to the previous version until we resolve the issue.

This change also removes the pin for the very old Ruby version.

Closes-Bug: #1917457
Change-Id: I62f35dce338ae186a217dd1d0a141d3a737243a0
This commit is contained in:
Takashi Kajinami 2021-03-02 21:36:48 +09:00
parent 3ac64d4f45
commit 4d2d86e0df
5 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,9 +37,7 @@
cmd: | cmd: |
ruby <<EOF ruby <<EOF
cmd = 'gem install bundler --no-document --verbose --no-user-install' cmd = 'gem install bundler --no-document --verbose --no-user-install'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then cmd += ' -v 2.2.11'
cmd += ' -v 1.17.3'
end
system(cmd) system(cmd)
EOF EOF
environment: environment:

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

@ -23,9 +23,7 @@
if [ -f Gemfile ]; then if [ -f Gemfile ]; then
ruby <<EOF ruby <<EOF
cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}' cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then cmd += ' -v 2.2.11'
cmd += ' -v 1.17.3'
end
system(cmd) system(cmd)
EOF EOF
$GEM_BIN_DIR/bundle install --without system_tests --retry 3 $GEM_BIN_DIR/bundle install --without system_tests --retry 3

4
playbooks/run-litmus-tests.yaml
View File

@ -20,9 +20,7 @@
export GEM_BIN_DIR=$GEM_HOME/bin export GEM_BIN_DIR=$GEM_HOME/bin
ruby <<EOF ruby <<EOF
cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}' cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then cmd += ' -v 2.2.11'
cmd += ' -v 1.17.3'
end
system(cmd) system(cmd)
EOF EOF
$GEM_BIN_DIR/bundle install --without system_tests --retry 3 $GEM_BIN_DIR/bundle install --without system_tests --retry 3

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

@ -8,9 +8,7 @@
export GEM_BIN_DIR=$GEM_HOME/bin export GEM_BIN_DIR=$GEM_HOME/bin
ruby <<EOF ruby <<EOF
cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}' cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then cmd += ' -v 2.2.11'
cmd += ' -v 1.17.3'
end
system(cmd) system(cmd)
EOF EOF
$GEM_BIN_DIR/bundle install --retry 3 $GEM_BIN_DIR/bundle install --retry 3

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

@ -20,9 +20,7 @@
export GEM_BIN_DIR=$GEM_HOME/bin export GEM_BIN_DIR=$GEM_HOME/bin
ruby <<EOF ruby <<EOF
cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}' cmd = 'gem install bundler --no-document --verbose --no-user-install --bindir=${GEM_BIN_DIR}'
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0') then cmd += ' -v 2.2.11'
cmd += ' -v 1.17.3'
end
system(cmd) system(cmd)
EOF EOF
$GEM_BIN_DIR/bundle install --retry 3 $GEM_BIN_DIR/bundle install --retry 3