From 712b258f2d1870b3f07fb67b043769999edb3ef5 Mon Sep 17 00:00:00 2001
From: mnasiadka <mnasiadka@gmail.com>
Date: Tue, 2 Jun 2020 08:16:52 +0000
Subject: [PATCH] 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
---
 tools/pre-commit-hook      | 6 +-----
 tools/validate-all-yaml.sh | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/pre-commit-hook b/tools/pre-commit-hook
index be7bc6db3a..e7c0de593d 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 f74a8018d0..9780f1aa9b 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