From 7f59e9c845d6722b2e26ffa291f7fcd8be95d89b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 10 Mar 2020 14:16:02 +0900
Subject: [PATCH] Explicitly set --bindir when isntalling bundle

... so that we can make sure that bundle command is installed in
GEM_HOME/bin directory.

Change-Id: I1ea78bbd2b7fe22d510e10b0c96c0ed7bdc9f8a3
Closes-Bug: #1866176
(cherry picked from commit 0be086fef570892654e288b086ab175df418fa72)
(cherry picked from commit 7d64abe4aaf7ba5c7ebaf33fa41808c9537028bd)
---
 playbooks/run-beaker-tests.yaml | 7 ++++---
 playbooks/run-lint-tests.yaml   | 9 +++++----
 playbooks/run-syntax-tests.yaml | 7 ++++---
 playbooks/run-unit-tests.yaml   | 7 ++++---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/playbooks/run-beaker-tests.yaml b/playbooks/run-beaker-tests.yaml
index f64a93eae..414177d29 100644
--- a/playbooks/run-beaker-tests.yaml
+++ b/playbooks/run-beaker-tests.yaml
@@ -48,16 +48,17 @@
           fi
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
+          export GEM_BIN_DIR=$GEM_HOME/bin
           if [ -f Gemfile ]; then
             ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
+          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
           system(cmd)
           EOF
-            $GEM_HOME/bin/bundle install --without system_tests --retry 3
-            $GEM_HOME/bin/bundle exec rspec spec/acceptance
+            $GEM_BIN_DIR/bundle install --without system_tests --retry 3
+            $GEM_BIN_DIR/bundle exec rspec spec/acceptance
           else
             gem install rake -n ./.bundled_gems/ --no-user-instal
             gem install beaker-rspec --no-user-install
diff --git a/playbooks/run-lint-tests.yaml b/playbooks/run-lint-tests.yaml
index 9befbea33..cd8097e04 100644
--- a/playbooks/run-lint-tests.yaml
+++ b/playbooks/run-lint-tests.yaml
@@ -19,18 +19,19 @@
           fi
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
+          export GEM_BIN_DIR=$GEM_HOME/bin
           if [ -f Gemfile ]; then
             ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
+          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
           system(cmd)
           EOF
-            $GEM_HOME/bin/bundle install --without system_tests --retry 3
-            $GEM_HOME/bin/bundle exec rake lint 2>&1
+            $GEM_BIN_DIR/bundle install --without system_tests --retry 3
+            $GEM_BIN_DIR/bundle exec rake lint 2>&1
             if [ -f metadata.json ]; then
-              $GEM_HOME/bin/bundle exec rake metadata_lint 2>&1
+              $GEM_BIN_DIR/bundle exec rake metadata_lint 2>&1
             fi
           else
             gem install rake -n ./.bundled_gems/ --no-ri --no-rdoc --no-user-install
diff --git a/playbooks/run-syntax-tests.yaml b/playbooks/run-syntax-tests.yaml
index 1037ae37b..4ef2a398f 100644
--- a/playbooks/run-syntax-tests.yaml
+++ b/playbooks/run-syntax-tests.yaml
@@ -5,14 +5,15 @@
           export PUPPET_GEM_VERSION='~> {{ puppet }}'
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
+          export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
+          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
           system(cmd)
           EOF
-          $GEM_HOME/bin/bundle install --retry 3
-          $GEM_HOME/bin/bundle exec rake syntax
+          $GEM_BIN_DIR/bundle install --retry 3
+          $GEM_BIN_DIR/bundle exec rake syntax
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/run-unit-tests.yaml b/playbooks/run-unit-tests.yaml
index 57124f292..c011cd650 100644
--- a/playbooks/run-unit-tests.yaml
+++ b/playbooks/run-unit-tests.yaml
@@ -10,14 +10,15 @@
           export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
           mkdir .bundled_gems
           export GEM_HOME=`pwd`/.bundled_gems
+          export GEM_BIN_DIR=$GEM_HOME/bin
           ruby <<EOF
-          cmd = 'gem install bundler --no-rdoc --no-ri --verbose --no-user-install'
+          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
           system(cmd)
           EOF
-          $GEM_HOME/bin/bundle install --retry 3
-          $GEM_HOME/bin/bundle exec rake spec SPEC_OPTS='--format documentation'
+          $GEM_BIN_DIR/bundle install --retry 3
+          $GEM_BIN_DIR/bundle exec rake spec SPEC_OPTS='--format documentation'
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'