opendev/system-config
Code Issues Proposed changes

Merge "Use strainer for chef checks when possible"

Browse Source
This commit is contained in:
Jenkins 2014-06-01 03:56:44 +00:00 committed by Gerrit Code Review
commit 5fb81cf31b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,20 +141,32 @@
builders: builders:
- shell: | - shell: |
COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\') COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
ruby1.9.1 /usr/bin/bundle exec rubocop if grep rubocop: Strainerfile; then
ruby1.9.1 /usr/bin/bundle exec strainer test -o rubocop
else
ruby1.9.1 /usr/bin/bundle exec ruby1.9.1 /usr/bin/bundle exec rubocop
fi
- builder: - builder:
name: chef-cookbook-foodcritic name: chef-cookbook-foodcritic
builders: builders:
- shell: | - shell: |
ruby1.9.1 /usr/bin/bundle exec foodcritic -f any -t ~FC003 -t ~FC023 . if grep foodcritic: Strainerfile; then
ruby1.9.1 /usr/bin/bundle exec strainer test -o foodcritic
else
ruby1.9.1 /usr/bin/bundle exec foodcritic -f any -t ~FC003 -t ~FC023 .
fi
- builder: - builder:
name: chef-cookbook-chefspec name: chef-cookbook-chefspec
builders: builders:
- shell: | - shell: |
COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\') COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
ruby1.9.1 /usr/bin/bundle exec rspec .cookbooks/$COOKBOOK/spec if grep chefspec: Strainerfile; then
ruby1.9.1 /usr/bin/bundle exec strainer test -o chefspec
else
ruby1.9.1 /usr/bin/bundle exec rspec .cookbooks/$COOKBOOK/spec
fi
- builder: - builder:
name: run-tests name: run-tests