From 25bb682cd194ac39f8bca4cc99b4488c36463cec Mon Sep 17 00:00:00 2001
From: Leo Simons <lsimons@schubergphilis.com>
Date: Tue, 22 Jul 2014 15:40:31 +0200
Subject: [PATCH] CLOUDSTACK-7143: fix the fix for rvm/ruby/bundler setup on
 jenkins

The recommended use of --deployment goes along with the requirement to
check Gemfile.lock into source control, which I don't want to do.
---
 tools/appliance/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 282472d525e..d315b43e20e 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -260,7 +260,8 @@ function setup_ruby() {
     # .rvmrc won't get trusted/auto-loaded by jenkins by default
     export VAGRANT_HOME=$HOME/.vagrant.d-release-cloudstack
     rvm use ruby-1.9.3@vagrant-release-cloudstack --create
-    bundle_args="--deployment"
+    # do not use --deployment since that requires Gemfile.lock...and we prefer an up-to-date veewee
+    bundle_args="--path vendor/bundle"
   fi
   bundle check || bundle install ${bundle_args}
 }