[PDF] check-jinja: Replace encrypted str w/ dummy

[pharos.git] / config / utils / check-jinja2.sh

diff --git a/config/utils/check-jinja2.sh b/config/utils/check-jinja2.sh
index 2953ff6..c33bef5 100755 (executable)
--- a/config/utils/check-jinja2.sh
+++ b/config/utils/check-jinja2.sh
@@ -17,6 +17,8 @@ INSTALLER_ADAPTERS='./config/installers/*'
 TMPF='/tmp/out.yml' # should be outside Jenkins WS to prevent data leakage
 RC=0
 
+echo "Using $(yamllint --version)"
+
 # Build a table header, using ';' as column sep
 SUMMARY='PDF Verify Matrix;YAML Lint;'
 for adapter in ${INSTALLER_ADAPTERS}; do
@@ -26,6 +28,7 @@ done
 # Iterate all PDFs, check with each installer adapter, log results
 while IFS= read -r lab_config; do
     valid_yaml='OK'
+    echo -e "\n###################### ${lab_config} ######################\n"
     echo -e "\n\nyamllint -s ${lab_config}"
     if ! yamllint -s "${lab_config}"; then valid_yaml='FAIL'; fi
     SUMMARY+="\n${lab_config#labs/};${valid_yaml};"
@@ -40,7 +43,9 @@ while IFS= read -r lab_config; do
                 echo 'Result: PASS'
                 ((pdf_inst_pass+=1))
                 echo -e "\nyamllint -s ${jinja_template%.j2}"
-                if yamllint -s "${TMPF}"; then ((pdf_yaml_pass+=1)); fi
+                if yamllint -s <(sed 's|ENC\[PKCS.*\]|opnfv|g' "${TMPF}"); then
+                    ((pdf_yaml_pass+=1));
+                fi
             else
                 echo 'Result: FAIL'
                 RC=1
@@ -49,7 +54,7 @@ while IFS= read -r lab_config; do
         done < <(find "${adapter}" -name '*.j2')
         SUMMARY+="${pdf_yaml_pass}/${pdf_inst_pass}/${pdf_inst};"
     done
-done < <(find 'config' 'labs' -name 'pod*.yaml')
+done < <(find 'labs' -name 'pod*.yaml')
 
 rm -f "${TMPF}"
 echo -e '\n\nNOTE: tuple fmt: (valid YAML output/sucessful parse/templates).\n'