aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authormnasiadka <mnasiadka@gmail.com>2020-06-02 08:16:52 +0000
committermnasiadka <mnasiadka@gmail.com>2020-06-02 08:31:33 +0000
commit712b258f2d1870b3f07fb67b043769999edb3ef5 (patch)
tree086f69cc6b95053423c55e0496874628608d927a /tools
parent6d223d3005bab377339f2d91e53458f1037c4bf9 (diff)
downloadkolla-712b258f2d1870b3f07fb67b043769999edb3ef5.tar.gz
kolla-712b258f2d1870b3f07fb67b043769999edb3ef5.zip
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
Diffstat (limited to 'tools')
-rwxr-xr-xtools/pre-commit-hook6
-rwxr-xr-xtools/validate-all-yaml.sh2
2 files changed, 2 insertions, 6 deletions
diff --git a/tools/pre-commit-hook b/tools/pre-commit-hook
index be7bc6db3..e7c0de593 100755
--- a/tools/pre-commit-hook
+++ b/tools/pre-commit-hook
@@ -33,12 +33,8 @@ echo "=== yaml checks ==="
${TOPLEVEL}/tools/validate-all-yaml.sh || RES=1
-echo "=== json checks ==="
-
-${TOPLEVEL}/tools/validate-all-json.sh || RES=1
-
echo "=== dockerfile checks ==="
-${TOPLEVEL}/tools/validate-all-dockerfiles || RES=1
+${TOPLEVEL}/tools/validate-all-dockerfiles.sh || RES=1
exit $RES
diff --git a/tools/validate-all-yaml.sh b/tools/validate-all-yaml.sh
index f74a8018d..9780f1aa9 100755
--- a/tools/validate-all-yaml.sh
+++ b/tools/validate-all-yaml.sh
@@ -5,4 +5,4 @@ REAL_PATH=$(realpath $0)
cd "$(dirname "$REAL_PATH")/.."
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