opendev/system-config
Code Issues Proposed changes

Merge "Allow compatibility with Berkshelf 2.x and 3.x"

Browse Source
This commit is contained in:
Jenkins 2014-08-07 22:31:31 +00:00 committed by Gerrit Code Review
commit 2995d11779
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,12 @@
builders: builders:
- shell: | - shell: |
mkdir -p .cookbooks mkdir -p .cookbooks
grep -E .*berkshelf.*3\.\d*\.\d*.* Gemfile
if [ $? -eq 0 ]; then
ruby1.9.1 /usr/bin/bundle exec berks vendor .cookbooks
else
ruby1.9.1 /usr/bin/bundle exec berks install --path=.cookbooks ruby1.9.1 /usr/bin/bundle exec berks install --path=.cookbooks
fi
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"