build/test_basics.rb in passenger-5.0.30 vs build/test_basics.rb in passenger-5.1.0

@@ -55,12 +55,11 @@
   else
     bundle_args = ENV['BUNDLE_ARGS'].to_s
   end
 
   if !PlatformInfo.locate_ruby_tool('bundle') || bundler_too_old?
-    # workaround for issue "bluecloth not found" when using 1.12.1
-    sh "#{gem_install} bundler --version 1.11.2"
+    sh "#{gem_install} bundler"
   end
 
   if install_base_deps && install_doctools
     sh "bundle install #{bundle_args} --without="
   else
@@ -69,10 +68,21 @@
     end
     if install_doctools
       sh "bundle install #{bundle_args} --without base"
     end
   end
+  
+  if install_doctools
+    # workaround for issue "bluecloth not found" when using 1.12.x
+    sh "#{gem_install} bundler --version 1.11.2"
+    sh "rvm list"
+  end
+
   if boolean_option('USH_BUNDLES', default)
+    # see what is available for Submodule tests just in case Travis CI environment changes
+    # || true to avoid missing rvm command triggering a failure on Jenkins CI
+    sh "rvm list || true"
+    
     sh "cd src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_core" \
       " && bundle install #{bundle_args} --with travis --without doc notravis"
     sh "cd src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_rails" \
       " && bundle install #{bundle_args} --without doc notravis"
     sh "cd src/ruby_supportlib/phusion_passenger/vendor/union_station_hooks_rails" \