Merge pull request #12069 from jasonwbarnett/bugfix/update-bundler-calls

Update bundle config set path

5 files changed, 55 insertions, 28 deletions

diff --git a/.expeditor/scripts/bk_linux_exec.sh b/.expeditor/scripts/bk_linux_exec.sh
index fbfd376581..95848fd578 100755
--- a/.expeditor/scripts/bk_linux_exec.sh
+++ b/.expeditor/scripts/bk_linux_exec.sh
@@ -33,7 +33,8 @@ export CHEF_LICENSE="accept-silent"
 echo "--- Installing Gems"
 echo 'gem: --no-document' >> ~/.gemrc
 sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-bundle install --jobs=3 --retry=3 --path=../vendor/bundle
+bundle config set --local path 'vendor/bundle'
+bundle install --jobs=3 --retry=3
 
 echo "--- Config information"
 
diff --git a/.expeditor/scripts/bk_win_prep.ps1 b/.expeditor/scripts/bk_win_prep.ps1
index 69f35a1ff2..62f7cb1f32 100644
--- a/.expeditor/scripts/bk_win_prep.ps1
+++ b/.expeditor/scripts/bk_win_prep.ps1
@@ -12,5 +12,6 @@ if (-not $?) { throw "Can't run Bundler. Is it installed?" }
 
 echo "--- bundle install"
 bundle config set --local without omnibus_package
-bundle install --jobs=3 --retry=3  --path=vendor/bundle
-if (-not $?) { throw "Unable to install gem dependencies" }
\ No newline at end of file
+bundle config set --local path 'vendor/bundle'
+bundle install --jobs=3 --retry=3
+if (-not $?) { throw "Unable to install gem dependencies" }
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 99d2109d8f..bafdf44c20 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -20,7 +20,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd chef-utils
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec
   expeditor:
     executor:
@@ -32,7 +33,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd chef-config
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec
   expeditor:
     executor:
@@ -47,7 +49,8 @@ steps:
   commands:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:integration
   expeditor:
     executor:
@@ -61,7 +64,8 @@ steps:
     - apt-get update -y
     - apt-get install -y cron locales libarchive-dev # needed for functional tests to pass
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:functional
   expeditor:
     executor:
@@ -75,7 +79,8 @@ steps:
     - apt-get update -y
     - apt-get install -y libarchive-dev
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
   expeditor:
@@ -87,7 +92,8 @@ steps:
   commands:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:integration
   expeditor:
     executor:
@@ -101,7 +107,8 @@ steps:
     - apt-get update -y
     - apt-get install -y cron locales libarchive-dev # needed for functional tests to pass
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:functional
   expeditor:
     executor:
@@ -115,7 +122,8 @@ steps:
     - apt-get update -y
     - apt-get install -y libarchive-dev
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
   expeditor:
@@ -127,7 +135,8 @@ steps:
   commands:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:integration
   expeditor:
     executor:
@@ -141,7 +150,8 @@ steps:
     - yum install -y crontabs e2fsprogs
     - yum install -y libarchive-devel
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:functional
   expeditor:
     executor:
@@ -154,7 +164,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - yum install -y libarchive-devel
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
   expeditor:
@@ -167,7 +178,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - zypper install -y cron insserv-compat
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:integration
   expeditor:
     executor:
@@ -181,7 +193,8 @@ steps:
     - zypper install -y cronie insserv-compat
     - zypper install -y libarchive-devel
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:functional
   expeditor:
     executor:
@@ -194,7 +207,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - zypper install -y cron insserv-compat libarchive-devel
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
   expeditor:
@@ -206,7 +220,8 @@ steps:
   commands:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:integration
   expeditor:
     executor:
@@ -219,7 +234,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - dnf install -y crontabs e2fsprogs
     - cd /workdir; bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:functional
   expeditor:
     executor:
@@ -235,7 +251,8 @@ steps:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - dnf install -y libarchive-devel
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
   expeditor:
@@ -287,7 +304,8 @@ steps:
   commands:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec tasks/bin/run_external_test chef/chef-zero main rake pedant
   expeditor:
     executor:
@@ -301,7 +319,8 @@ steps:
   commands:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec tasks/bin/run_external_test chef/cheffish main rake spec
   expeditor:
     executor:
@@ -312,7 +331,8 @@ steps:
   commands:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec tasks/bin/run_external_test chefspec/chefspec main rake
   expeditor:
     executor:
@@ -323,7 +343,8 @@ steps:
   commands:
     - /workdir/.expeditor/scripts/bk_container_prep.sh
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec tasks/bin/run_external_test chef/knife-windows main rake spec
   expeditor:
     executor:
@@ -336,7 +357,8 @@ steps:
     - apt-get update -y
     - apt-get install -y graphviz
     - bundle config set --local without omnibus_package
-    - bundle install --jobs=3 --retry=3 --path=vendor/bundle
+    - bundle config set --local path 'vendor/bundle'
+    - bundle install --jobs=3 --retry=3
     - bundle exec tasks/bin/run_external_test berkshelf/berkshelf main rake
   expeditor:
     executor:
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 94b36b7275..a34cdd6d38 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -41,7 +41,8 @@ jobs:
         cd kitchen-tests
         $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH
         bundle config set --local without 'omnibus_package'
-        bundle install --jobs=3 --retry=3 --path=vendor/bundle
+        bundle config set --local path 'vendor/bundle'
+        bundle install --jobs=3 --retry=3
         gem install berkshelf --no-doc
         # berks emits a ruby warning when it loads net/http due to a previously
         # defined constant. Even though it is just a warning, powershell immediately
@@ -83,7 +84,8 @@ jobs:
       run: |
         cd kitchen-tests
         sudo /opt/chef/embedded/bin/bundle config set --local without 'omnibus_package'
-        sudo /opt/chef/embedded/bin/bundle install --jobs=3 --retry=3 --path=vendor/bundle
+        sudo /opt/chef/embedded/bin/bundle config set --local path 'vendor/bundle'
+        sudo /opt/chef/embedded/bin/bundle install --jobs=3 --retry=3
         sudo /opt/chef/embedded/bin/gem install berkshelf --no-doc
         sudo /opt/chef/embedded/bin/berks vendor cookbooks
         sudo /opt/chef/bin/chef-client -z -o end_to_end --chef-license accept-no-persist
diff --git a/tasks/rspec.rb b/tasks/rspec.rb
index 58dab33a0c..18f3318e55 100644
--- a/tasks/rspec.rb
+++ b/tasks/rspec.rb
@@ -30,7 +30,8 @@ begin
         puts "--- Running #{gem} specs"
         Bundler.with_unbundled_env do
           puts "Executing tests in #{Dir.pwd}:"
-          sh("bundle install --jobs=3 --retry=3 --path=../vendor/bundle")
+          sh("bundle config set --local path 'vendor/bundle'")
+          sh("bundle install --jobs=3 --retry=3")
           sh("bundle exec rake spec")
         end
       end