opendev/system-config
Code Issues Proposed changes

Merge "Allow blank lines in node{} with apply test"

Browse Source
This commit is contained in:
Jenkins 2015-04-24 00:59:29 +00:00 committed by Gerrit Code Review
commit 05d1fee6ec
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/apply-test.sh
View File

@ -59,10 +59,17 @@ if [[ ! -d applytest ]] ; then
mkdir applytest mkdir applytest
fi fi
csplit -sf applytest/puppetapplytest manifests/site.pp '/^$/' {*} # First split the variables at the beginning of the file
sed -i -e 's/^[^][:space:]$]/#&/g' applytest/puppetapplytest* csplit -sf applytest/prep manifests/site.pp '/^$/' {0}
sed -i -e 's@hiera(.\([^.]*\).,\([^)]*\))@\2@' applytest/puppetapplytest* # Then split the class defs.
mv applytest/*00 applytest/head # These are the top-level variables defined in site.pp csplit -sf applytest/puppetapplytest applytest/prep01 '/^}$/' {*}
# Remove } header left by csplit
sed -i -e '/^\}$/d' applytest/puppetapplytest*
# Comment out anything that doesn't begin with a space.
# This gives us the node {} internal contents.
sed -i -e 's/^[^][:space:]$]/#&/g' applytest/prep00 applytest/puppetapplytest*
sed -i -e 's@hiera(.\([^.]*\).,\([^)]*\))@\2@' applytest/prep00 applytest/puppetapplytest*
mv applytest/prep00 applytest/head # These are the top-level variables defined in site.pp
if [[ `lsb_release -i -s` == 'CentOS' ]]; then if [[ `lsb_release -i -s` == 'CentOS' ]]; then
if [[ `lsb_release -r -s` =~ '6' ]]; then if [[ `lsb_release -r -s` =~ '6' ]]; then