Merge pull request ManageIQ#15585 from Fryguy/fix_bundle_override

Fix bundle override in ManageIQ::Environment
zeari · Jul 17, 2017 · 295c3fd · 295c3fd
2 parents da486b2 + d64fe19
commit 295c3fd
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/manageiq/environment.rb b/lib/manageiq/environment.rb
@@ -52,13 +52,19 @@ def self.install_bundler
     end
 
     def self.bundle_install(root = APP_ROOT)
-      system('bundle check', :chdir => root) || system!('bundle install', :chdir => root)
+      system("bundle check", :chdir => root) ||
+        system!("bundle install #{bundle_params}", :chdir => root)
     end
 
     def self.bundle_update(root = APP_ROOT)
-      system!('bundle update', :chdir => root)
+      system!("bundle update #{bundle_params}", :chdir => root)
     end
 
+    def self.bundle_params
+      "--jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}" if ENV['CI']
+    end
+    private_class_method :bundle_params
+
     def self.create_database
       puts "\n== Updating database =="
       run_rake_task("db:create")