openstack/puppet-openstack-integration
Code Issues Proposed changes

Pin bundler to 1.17.3

Browse Source 
bundler 2.0.0 is released which needs ruby >= 2.3.0 and rubygems >= 3.0
but we are behind, so let's pin bundler to 1.17.3.

Closes-Bug: #1810401
Change-Id: Ia1190e36443e8ae24219d62771a9fd5ad46e8b25
This commit is contained in:
Emilien Macchi 2019-01-03 12:19:25 +01:00 committed by Alex Schultz
parent 4bc57e6541
commit 43ec9b9232
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
all-in-one.sh
View File

@ -63,7 +63,7 @@ fi
print_header 'Install Bundler' print_header 'Install Bundler'
mkdir -p .bundled_gems mkdir -p .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems export GEM_HOME=`pwd`/.bundled_gems
gem install bundler --no-rdoc --no-ri --verbose gem install bundler --version 1.17.3 --no-rdoc --no-ri --verbose
set -e set -e
./run_tests.sh ./run_tests.sh

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

@ -43,6 +43,8 @@
- name: Install bundler - name: Install bundler
gem: gem:
name: bundler name: bundler
# Required against https://bugs.launchpad.net/puppet-openstack-integration/+bug/1810401
version: 1.17.3
user_install: false user_install: false
environment: environment:
GEM_HOME: "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/.bundled_gems" GEM_HOME: "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/.bundled_gems"

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

@ -46,7 +46,7 @@
mkdir .bundled_gems mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems export GEM_HOME=`pwd`/.bundled_gems
if [ -f Gemfile ]; then if [ -f Gemfile ]; then
gem install bundler --no-rdoc --no-ri --verbose gem install bundler --version 1.17.3 --no-rdoc --no-ri --verbose
$GEM_HOME/bin/bundle install --without system_tests --retry 3 $GEM_HOME/bin/bundle install --without system_tests --retry 3
$GEM_HOME/bin/bundle exec rspec spec/acceptance $GEM_HOME/bin/bundle exec rspec spec/acceptance
else else

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

@ -20,7 +20,7 @@
mkdir .bundled_gems mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems export GEM_HOME=`pwd`/.bundled_gems
if [ -f Gemfile ]; then if [ -f Gemfile ]; then
gem install bundler --no-rdoc --no-ri --verbose gem install --version 1.17.3 bundler --no-rdoc --no-ri --verbose
$GEM_HOME/bin/bundle install --without system_tests --retry 3 $GEM_HOME/bin/bundle install --without system_tests --retry 3
$GEM_HOME/bin/bundle exec rake lint 2>&1 $GEM_HOME/bin/bundle exec rake lint 2>&1
if [ -f metadata.json ]; then if [ -f metadata.json ]; then

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

@ -5,7 +5,7 @@
export PUPPET_GEM_VERSION='~> {{ puppet }}' export PUPPET_GEM_VERSION='~> {{ puppet }}'
mkdir .bundled_gems mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems export GEM_HOME=`pwd`/.bundled_gems
gem install bundler --no-rdoc --no-ri --verbose gem install bundler --version 1.17.3 --no-rdoc --no-ri --verbose
$GEM_HOME/bin/bundle install --retry 3 $GEM_HOME/bin/bundle install --retry 3
$GEM_HOME/bin/bundle exec rake syntax $GEM_HOME/bin/bundle exec rake syntax
chdir: '{{ ansible_user_dir }}/workspace' chdir: '{{ ansible_user_dir }}/workspace'

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

@ -12,7 +12,7 @@
fi fi
mkdir .bundled_gems mkdir .bundled_gems
export GEM_HOME=`pwd`/.bundled_gems export GEM_HOME=`pwd`/.bundled_gems
gem install bundler --no-rdoc --no-ri --verbose gem install bundler --version 1.17.3 --no-rdoc --no-ri --verbose
$GEM_HOME/bin/bundle install --retry 3 $GEM_HOME/bin/bundle install --retry 3
$GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation' $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation'
chdir: '{{ ansible_user_dir }}/workspace' chdir: '{{ ansible_user_dir }}/workspace'