opendev/system-config
Code Issues Proposed changes

Supply full bundle path for Ruby 1.9.1

Browse Source 
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
This commit is contained in:
Jay Pipes 2013-05-13 17:39:56 -04:00 committed by Jenkins
parent 832992dc2d
commit 7013e66a08
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
View File

@ -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