Make r10k check optional (default enabled)

simondeziel · simondeziel · commit 9f6aedb28a6d · 2018-10-14T16:03:49.000-04:00
diff --git a/commit_hooks/config.cfg b/commit_hooks/config.cfg
@@ -3,6 +3,7 @@ CHECK_PUPPET_DOCS="enabled" # enabled, permissive or disabled (permissive runs b
 USE_PUPPET_FUTURE_PARSER="disabled" # enabled or disabled
 CHECK_INITIAL_COMMIT="disabled" # enabled or disabled
 CHECK_RSPEC="enabled" # enabled or disabled
+CHECK_R10K="enabled" # enabled or disabled
 export PUPPET_LINT_OPTIONS="" # puppet-lint options to use if no rc file is present.  Defaults to "--no-140chars-check"
 export PUPPET_LINT_FAIL_ON_WARNINGS="true" # Set the puppet-lint option --fail-on-warnings
 UNSET_RUBY_ENV="enabled" # enabled or disabled. Required for Gitlab.
diff --git a/pre-commit b/pre-commit
@@ -177,16 +177,18 @@ if [[ "$CHECK_RSPEC" != "disabled" ]] ; then
 fi
 
 #r10k puppetfile syntax check
-if hash r10k >/dev/null 2>&1; then
-  if [[ "$changedfile" = "Puppetfile" ]]; then
-        "${subhook_root}/r10k_syntax_check.sh"
-        RC=$?
-        if [[ "$RC" -ne 0 ]]; then
-                failures=$((failures + 1))
-        fi
+if [[ "$CHECK_R10K" != "disabled" ]] ; then
+  if hash r10k >/dev/null 2>&1; then
+    if [[ "$changedfile" = "Puppetfile" ]]; then
+          "${subhook_root}/r10k_syntax_check.sh"
+          RC=$?
+          if [[ "$RC" -ne 0 ]]; then
+                  failures=$((failures + 1))
+          fi
+    fi
+  else
+      echo "r10k not installed. Skipping r10k Puppetfile test..."
   fi
-else
-    echo "r10k not installed. Skipping r10k Puppetfile test..."
 fi
 
 #summary
diff --git a/pre-receive b/pre-receive
@@ -148,16 +148,18 @@ while read -r oldrev newrev refname; do
             fi
         fi
         #r10k puppetfile syntax check
-        if hash r10k >/dev/null 2>&1; then
-          if [ "$changedfile" = "Puppetfile" ]; then
-                ${subhook_root}/r10k_syntax_check.sh $tmptree/$changedfile
-                RC=$?
-                if [ "$RC" -ne 0 ]; then
-                       failures=`expr $failures + 1`
-                fi
+        if [[ "$CHECK_R10K" != "disabled" ]] ; then
+          if hash r10k >/dev/null 2>&1; then
+            if [[ "$changedfile" = "Puppetfile" ]]; then
+                  "${subhook_root}/r10k_syntax_check.sh" "$tmptree/$changedfile"
+                  RC=$?
+                  if [[ "$RC" -ne 0 ]]; then
+                          failures=$((failures + 1))
+                  fi
+            fi
+          else
+              echo "r10k not installed. Skipping r10k Puppetfile test..."
           fi
-        else
-            echo "r10k not installed. Skipping r10k Puppetfile test..."
         fi
     done
 done
