summaryrefslogtreecommitdiffstats
path: root/config/utils
diff options
context:
space:
mode:
Diffstat (limited to 'config/utils')
-rwxr-xr-xconfig/utils/check-jinja2.sh2
-rwxr-xr-xconfig/utils/check-schema.sh21
-rwxr-xr-xconfig/utils/validate_schema.py2
3 files changed, 20 insertions, 5 deletions
diff --git a/config/utils/check-jinja2.sh b/config/utils/check-jinja2.sh
index 59a6506b..b7fa5912 100755
--- a/config/utils/check-jinja2.sh
+++ b/config/utils/check-jinja2.sh
@@ -19,7 +19,7 @@ FILTER_LAB=${1:-*} # e.g. 'zte' (glob)
FILTER_POD=${2:-(pod|virtual)[[:digit:]]+} # e.g. 'pod1' (regex)
FILTER_IA=${3:-*} # e.g. 'fuel' (glob)
-GEN_CFG='./config/utils/generate_config.py'
+GEN_CFG='python ./config/utils/generate_config.py'
INSTALLER_ADAPTERS="./config/installers/${FILTER_IA}"
TMPF='/tmp/out.yml' # should be outside Jenkins WS to prevent data leakage
RC=0
diff --git a/config/utils/check-schema.sh b/config/utils/check-schema.sh
index 61bdec22..0cdc6f29 100755
--- a/config/utils/check-schema.sh
+++ b/config/utils/check-schema.sh
@@ -9,23 +9,36 @@
export PATH=$PATH:/usr/local/bin/
-VALIDATE_SCHEMA='./config/utils/validate_schema.py'
+VALIDATE_SCHEMA='python ./config/utils/validate_schema.py'
PDF_SCHEMA='./config/pdf/pod1.schema.yaml'
+IDF_SCHEMA='./config/pdf/idf-pod1.schema.yaml'
RC=0
+SUMMARY+=";;PDF;IDF;\n"
while IFS= read -r lab_config; do
pdf_cmd="${VALIDATE_SCHEMA} -s ${PDF_SCHEMA} -y ${lab_config}"
+ idf_cmd="${VALIDATE_SCHEMA} -s ${IDF_SCHEMA} -y ${lab_config/pod/idf-pod}"
echo "###################### ${lab_config} ######################"
- pdf_out=$(${pdf_cmd} |& sed 's|ENC\[PKCS.*\][\\n]*|opnfv|g')
+ pdf_out=$(${pdf_cmd} 2>&1 | sed 's|ENC\[PKCS.*\][\\n]*|opnfv|g')
if [ -z "${pdf_out}" ]; then
- SUMMARY+=";${lab_config#labs/};OK;\n"
+ SUMMARY+=";${lab_config#labs/};OK;"
echo "[PDF] [OK] ${pdf_cmd}"
else
- SUMMARY+=";${lab_config#labs/};ERROR;\n"
+ SUMMARY+=";${lab_config#labs/};ERROR;"
RC=1
echo "${pdf_out}"
echo "[PDF] [ERROR] ${pdf_cmd}"
fi
+ if [ ! -f "${lab_config/pod/idf-pod}" ]; then
+ SUMMARY+="-;\n"
+ elif ${idf_cmd}; then
+ SUMMARY+="OK;\n"
+ echo "[IDF] [OK] ${idf_cmd}"
+ else
+ SUMMARY+="ERROR;\n"
+ RC=1
+ echo "[IDF] [ERROR] ${idf_cmd}"
+ fi
echo ''
done < <(find 'labs' -name 'pod*.yaml')
diff --git a/config/utils/validate_schema.py b/config/utils/validate_schema.py
index 6bdc3bdb..42f475d8 100755
--- a/config/utils/validate_schema.py
+++ b/config/utils/validate_schema.py
@@ -34,6 +34,8 @@ def schema_version_workaround(node):
if type(item) is dict:
schema_version_workaround(item)
schema_version_workaround(_DICT)
+if 'idf' in _DICT:
+ schema_version_workaround(_DICT['idf'])
_VALIDATOR = jsonschema.Draft4Validator(_SCHEMA)
for error in _VALIDATOR.iter_errors(_DICT):