From 07d465ac7128ce1975912f7721309024f25f4bae Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 3 Jan 2019 12:19:25 +0100
Subject: [PATCH] Pin bundler to 1.17.3

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
(cherry picked from commit 43ec9b923280037013038ae2f4e0a51769ed513b)
---
 all-in-one.sh                           | 2 +-
 playbooks/prepare-node-integration.yaml | 4 +++-
 playbooks/run-beaker-tests.yaml         | 2 +-
 playbooks/run-lint-tests.yaml           | 2 +-
 playbooks/run-syntax-tests.yaml         | 2 +-
 playbooks/run-unit-tests.yaml           | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/all-in-one.sh b/all-in-one.sh
index a7268ce79..340b0259b 100755
--- a/all-in-one.sh
+++ b/all-in-one.sh
@@ -57,7 +57,7 @@ fi
 print_header 'Install Bundler'
 mkdir -p .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
 ./run_tests.sh
diff --git a/playbooks/prepare-node-integration.yaml b/playbooks/prepare-node-integration.yaml
index 84e042284..9990b41b5 100644
--- a/playbooks/prepare-node-integration.yaml
+++ b/playbooks/prepare-node-integration.yaml
@@ -43,6 +43,8 @@
     - name: Install bundler
       gem:
         name: bundler
+        # Required against https://bugs.launchpad.net/puppet-openstack-integration/+bug/1810401
+        version: 1.17.3
         user_install: false
       environment:
-        GEM_HOME: "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/.bundled_gems"
\ No newline at end of file
+        GEM_HOME: "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/.bundled_gems"
diff --git a/playbooks/run-beaker-tests.yaml b/playbooks/run-beaker-tests.yaml
index bdfda741b..ad7070ad2 100644
--- a/playbooks/run-beaker-tests.yaml
+++ b/playbooks/run-beaker-tests.yaml
@@ -45,7 +45,7 @@
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
           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 exec rspec spec/acceptance
           else
diff --git a/playbooks/run-lint-tests.yaml b/playbooks/run-lint-tests.yaml
index cd08a6dc2..68171d09b 100644
--- a/playbooks/run-lint-tests.yaml
+++ b/playbooks/run-lint-tests.yaml
@@ -19,7 +19,7 @@
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
           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
             $GEM_HOME/bin/bundle exec rake lint 2>&1
           else
diff --git a/playbooks/run-syntax-tests.yaml b/playbooks/run-syntax-tests.yaml
index 3407fac2a..b3cbd4eb4 100644
--- a/playbooks/run-syntax-tests.yaml
+++ b/playbooks/run-syntax-tests.yaml
@@ -5,7 +5,7 @@
           export PUPPET_GEM_VERSION='~> {{ puppet }}'
           mkdir .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
           # FUTURE_PARSER=yes is only supported by Puppet 3.x
           if [ "{{ puppet }}" -lt "4" ]; then
diff --git a/playbooks/run-unit-tests.yaml b/playbooks/run-unit-tests.yaml
index 81b9ddab3..39e1dc42a 100644
--- a/playbooks/run-unit-tests.yaml
+++ b/playbooks/run-unit-tests.yaml
@@ -7,7 +7,7 @@
           fi
           mkdir .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 exec rake spec SPEC_OPTS='--format documentation'
         chdir: '{{ ansible_user_dir }}/workspace'