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
This commit is contained in:
parent
ad87293150
commit
8372ef2d5e
@ -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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user