From 8372ef2d5e2d9708dca821ee055c325d44bb7225 Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Tue, 16 Sep 2014 14:15:58 -0500
Subject: [PATCH] Remove unnecessary metadata check

Remove metadata cookbook check from chef-berkshelf-prep as it is
not necessary for this prep step and causes the gate-openstack-chef-repo
job to fail as the repo does not contain a metadata file.
The $COOKBOOK is also not needed in the chefspec step and will be removed to
help simplify these steps to only what is necessary.

Change-Id: I90ef4b60fb8a9706cd3670cb2d4bdb06ed4b3d8e
Closes-Bug: #1370210
---
 .../files/jenkins_job_builder/config/macros.yaml          | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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 43fbea5777..a50bd2feb7 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -158,11 +158,6 @@
             mkdir -p .cookbooks
             bundle exec berks install --path=.cookbooks
           fi
-          COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
-          if [ -z $COOKBOOK ]; then
-              echo "Cookbook name not defined in metadata.rb"
-              exit 1
-          fi
 
 - builder:
     name: chef-cookbook-rubocop
@@ -191,11 +186,10 @@
     builders:
       - shell: |
           #!/bin/bash -x
-          COOKBOOK=$(awk '/^name/ {print $NF}' metadata.rb |tr -d \"\')
           if grep chefspec: Strainerfile; then
               bundle exec strainer test --cookbooks-path=.cookbooks --only=chefspec
           else
-              bundle exec rspec .cookbooks/$COOKBOOK/spec
+              bundle exec rspec --format documentation
           fi
 
 - builder: