From 4d2d86e0df434ee25a508aceb1ea209a0c64f80b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 2 Mar 2021 21:36:48 +0900
Subject: [PATCH] pin bundler to 2.2.11

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
---
 playbooks/prepare-node-integration.yaml | 4 +---
 playbooks/run-lint-tests.yaml           | 4 +---
 playbooks/run-litmus-tests.yaml         | 4 +---
 playbooks/run-syntax-tests.yaml         | 4 +---
 playbooks/run-unit-tests.yaml           | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/playbooks/prepare-node-integration.yaml b/playbooks/prepare-node-integration.yaml
index 6d85e376d..0dde9c7e4 100644
--- a/playbooks/prepare-node-integration.yaml
+++ b/playbooks/prepare-node-integration.yaml
@@ -37,9 +37,7 @@
         cmd: |
           ruby <<EOF
           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 1.17.3'
-          end
+          cmd += ' -v 2.2.11'
           system(cmd)
           EOF
       environment:
diff --git a/playbooks/run-lint-tests.yaml b/playbooks/run-lint-tests.yaml
index 65e0aed32..385cc3dde 100644
--- a/playbooks/run-lint-tests.yaml
+++ b/playbooks/run-lint-tests.yaml
@@ -23,9 +23,7 @@
           if [ -f Gemfile ]; then
             ruby <<EOF
           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 1.17.3'
-          end
+          cmd += ' -v 2.2.11'
           system(cmd)
           EOF
             $GEM_BIN_DIR/bundle install --without system_tests --retry 3
diff --git a/playbooks/run-litmus-tests.yaml b/playbooks/run-litmus-tests.yaml
index 7275c8303..95a5db5fb 100644
--- a/playbooks/run-litmus-tests.yaml
+++ b/playbooks/run-litmus-tests.yaml
@@ -20,9 +20,7 @@
           export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
           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 1.17.3'
-          end
+          cmd += ' -v 2.2.11'
           system(cmd)
           EOF
           $GEM_BIN_DIR/bundle install --without system_tests --retry 3
diff --git a/playbooks/run-syntax-tests.yaml b/playbooks/run-syntax-tests.yaml
index 6d58ab7a1..a3a603969 100644
--- a/playbooks/run-syntax-tests.yaml
+++ b/playbooks/run-syntax-tests.yaml
@@ -8,9 +8,7 @@
           export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
           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 1.17.3'
-          end
+          cmd += ' -v 2.2.11'
           system(cmd)
           EOF
           $GEM_BIN_DIR/bundle install --retry 3
diff --git a/playbooks/run-unit-tests.yaml b/playbooks/run-unit-tests.yaml
index 630d9161b..681b3e19c 100644
--- a/playbooks/run-unit-tests.yaml
+++ b/playbooks/run-unit-tests.yaml
@@ -20,9 +20,7 @@
           export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
           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 1.17.3'
-          end
+          cmd += ' -v 2.2.11'
           system(cmd)
           EOF
           $GEM_BIN_DIR/bundle install --retry 3