Merge pull request #232 from h0tw1r3/fix-bundle-beaker-command

fix beaker exec when called from bundle exec
puppetlabs · Feb 14, 2024 · 2dd706b · 2dd706b
2 parents b78c7d1 + ed4bf90
commit 2dd706b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/tasks/ci.rake b/tasks/ci.rake
@@ -299,7 +299,8 @@ end
 def beaker(command, *argv)
   argv.concat(ENV['OPTIONS'].split(' ')) if ENV['OPTIONS']
 
-  sh('beaker', command.to_s, *argv)
+  bundle_cmd = (ENV.fetch('BUNDLE_GEMFILE', false) && ENV.fetch('BUNDLE_BIN_PATH', false)) ? %w[bundle exec] : []
+  sh(*bundle_cmd, 'beaker', command.to_s, *argv)
 end
 
 def beaker_setup(type)