openstack
/
kolla
Code Issues Proposed changes

Fix pre-commit-hook 

Currently pre-commit-hook is failing due to yaml validations using
unversioned python and using non-existent json validations.

Change-Id: I67dc11efe667e2cc67ea1a731edc5c4a03ebd1e7
Closes-Bug: #1778146
This commit is contained in:
mnasiadka 2020-06-02 08:16:52 +00:00
parent 6d223d3005
commit 712b258f2d
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/pre-commit-hook
View File

@ -33,12 +33,8 @@ echo "=== yaml checks ==="
${TOPLEVEL}/tools/validate-all-yaml.sh || RES=1 ${TOPLEVEL}/tools/validate-all-yaml.sh || RES=1
echo "=== json checks ==="
${TOPLEVEL}/tools/validate-all-json.sh || RES=1
echo "=== dockerfile checks ===" echo "=== dockerfile checks ==="
${TOPLEVEL}/tools/validate-all-dockerfiles || RES=1 ${TOPLEVEL}/tools/validate-all-dockerfiles.sh || RES=1
exit $RES exit $RES

2
tools/validate-all-yaml.sh
View File

@ -5,4 +5,4 @@ REAL_PATH=$(realpath $0)
cd "$(dirname "$REAL_PATH")/.." cd "$(dirname "$REAL_PATH")/.."
find . -name '*.yaml' -o -name '*.yml' -print0 | find . -name '*.yaml' -o -name '*.yml' -print0 |
xargs -0 python tools/validate-yaml.py || exit 1 xargs -0 python3 tools/validate-yaml.py || exit 1