From 4ddb8d2fa0b08b426aaa14ebd2e6541d32b01ed6 Mon Sep 17 00:00:00 2001
From: Stephan Renatus <s.renatus@x-ion.de>
Date: Mon, 2 Jun 2014 12:41:42 +0200
Subject: [PATCH] Fix Chef cookbook-related strainer issue

The last change* sadly missed a call to berks install and hence makes
strainer fail every time.  This change introduces a berks install call
to a workspace-relative directory that is then passed to strainer.

To use strainer, we need chef-berkshelf-prep for each test suite, though.

*) I0353b8207abb116ea3849c04df39546f8c2625db

Change-Id: Ic10fc436fae2e5bcc05f9fae15e43b7601255471
---
 .../files/jenkins_job_builder/config/chef-jobs.yaml      | 2 ++
 .../files/jenkins_job_builder/config/macros.yaml         | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
index 11d8200668..64cc3decae 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/chef-jobs.yaml
@@ -20,6 +20,7 @@
       - revoke-sudo
       - gerrit-git-prep
       - chef-bundler-prep
+      - chef-berkshelf-prep
       - chef-cookbook-foodcritic
 
     publishers:
@@ -33,6 +34,7 @@
       - revoke-sudo
       - gerrit-git-prep
       - chef-bundler-prep
+      - chef-berkshelf-prep
       - chef-cookbook-rubocop
 
     publishers:
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 6a4a38adc6..ef5e1934cc 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -140,11 +140,10 @@
     name: chef-cookbook-rubocop
     builders:
       - shell: |
-          COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
           if grep rubocop: Strainerfile; then
-              ruby1.9.1 /usr/bin/bundle exec strainer test -o rubocop
+              ruby1.9.1 /usr/bin/bundle exec strainer test --cookbooks-path=.cookbooks --only=rubocop
           else
-              ruby1.9.1 /usr/bin/bundle exec ruby1.9.1 /usr/bin/bundle exec rubocop
+              ruby1.9.1 /usr/bin/bundle exec rubocop
           fi
 
 - builder:
@@ -152,7 +151,7 @@
     builders:
       - shell: |
           if grep foodcritic: Strainerfile; then
-              ruby1.9.1 /usr/bin/bundle exec strainer test -o foodcritic
+              ruby1.9.1 /usr/bin/bundle exec strainer test --cookbooks-path=.cookbooks --only=foodcritic
           else
               ruby1.9.1 /usr/bin/bundle exec foodcritic -f any -t ~FC003 -t ~FC023 .
           fi
@@ -163,7 +162,7 @@
       - shell: |
           COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
           if grep chefspec: Strainerfile; then
-              ruby1.9.1 /usr/bin/bundle exec strainer test -o chefspec
+              ruby1.9.1 /usr/bin/bundle exec strainer test --cookbooks-path=.cookbooks --only=chefspec
           else
               ruby1.9.1 /usr/bin/bundle exec rspec .cookbooks/$COOKBOOK/spec
           fi