From 7013e66a08ba9aa5392e4286cefde96e917ad006 Mon Sep 17 00:00:00 2001
From: Jay Pipes <jaypipes@gmail.com>
Date: Mon, 13 May 2013 17:39:56 -0400
Subject: [PATCH] Supply full bundle path for Ruby 1.9.1

Unfortunately, we will need to supply the full path
to /usr/bin/bundle along with specifying ruby1.9.1
to get around versioning issues.

Change-Id: I7927d42a432f82156f38036557c90e3c0e2ecb7d
Reviewed-on: https://review.openstack.org/29009
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: John Dewey <john@dewey.ws>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
---
 .../files/jenkins_job_builder/config/macros.yaml   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index 098efba37f..8532dc4a9c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -81,9 +81,9 @@
     builders:
       - shell: |
           mkdir -p .cookbooks .bundle
-          bundle install --path=.bundle
-          bundle exec berks install --path=.cookbooks
-          export COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
+          ruby1.9.1 /usr/bin/bundle install --path=.bundle
+          ruby1.9.1 /usr/bin/bundle exec berks install --path=.cookbooks
+          COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
           if [ -z $COOKBOOK ]; then
               echo "Cookbook name not defined in metadata.rb"
               exit 1
@@ -92,12 +92,16 @@
 - builder:
     name: chef-cookbook-lint
     builders:
-      - shell: "bundle exec foodcritic -f any -t ~FC003 -t ~FC023 .cookbooks/$COOKBOOK"
+      - shell: |
+          COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
+          ruby1.9.1 /usr/bin/bundle exec foodcritic -f any -t ~FC003 -t ~FC023 .cookbooks/$COOKBOOK
 
 - builder:
     name: chef-cookbook-rspec
     builders:
-      - shell: "bundle exec rspec .cookbooks/$COOKBOOK"
+      - shell: |
+          COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
+          ruby1.9.1 /usr/bin/bundle exec rspec .cookbooks/$COOKBOOK
 
 - builder:
     name: selenium