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
This commit is contained in:
parent
832992dc2d
commit
7013e66a08
@ -81,9 +81,9 @@
|
|||||||
builders:
|
builders:
|
||||||
- shell: |
|
- shell: |
|
||||||
mkdir -p .cookbooks .bundle
|
mkdir -p .cookbooks .bundle
|
||||||
bundle install --path=.bundle
|
ruby1.9.1 /usr/bin/bundle install --path=.bundle
|
||||||
bundle exec berks install --path=.cookbooks
|
ruby1.9.1 /usr/bin/bundle exec berks install --path=.cookbooks
|
||||||
export COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
|
COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
|
||||||
if [ -z $COOKBOOK ]; then
|
if [ -z $COOKBOOK ]; then
|
||||||
echo "Cookbook name not defined in metadata.rb"
|
echo "Cookbook name not defined in metadata.rb"
|
||||||
exit 1
|
exit 1
|
||||||
@ -92,12 +92,16 @@
|
|||||||
- builder:
|
- builder:
|
||||||
name: chef-cookbook-lint
|
name: chef-cookbook-lint
|
||||||
builders:
|
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:
|
- builder:
|
||||||
name: chef-cookbook-rspec
|
name: chef-cookbook-rspec
|
||||||
builders:
|
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:
|
- builder:
|
||||||
name: selenium
|
name: selenium
|
||||||
|
Loading…
Reference in New Issue
Block a user