Merge "add maintainer check to tests"

4 files changed, 34 insertions, 4 deletions

diff --git a/tools/pre-commit-hook b/tools/pre-commit-hook
index 699cb978e..475e05912 100755
--- a/tools/pre-commit-hook
+++ b/tools/pre-commit-hook
@@ -33,13 +33,19 @@ find . -type f -print0 |
 echo "=== yaml checks ==="
 
 find . -name '*.yaml' -print0 |
-    xargs -0 --no-run-if-empty python ${TOPLEVEL}/tools/try-parse-yaml.py
+    xargs -0 --no-run-if-empty ${TOPLEVEL}/tools/validate-yaml.py \
+        || RES = 1
 
 echo "=== json checks ==="
 
 find . -name '*.json' -print0 |
-    xargs -0 -n1 --no-run-if-empty python -mjson.tool \
-    || RES=1
+    xargs -0 --no-run-if-empty ${TOPLEVEL}/tools/validate-json.py \
+        || RES=1
 
-exit $RES
+echo "=== maintainer checks ==="
+
+find . -name Dockerfile -print0 |
+    xargs -0 --no-run-if-empty ${TOPLEVEL}/tools/validate-maintainer \
+        || RES=1
 
+exit $RES
diff --git a/tools/validate-all-maintainer.sh b/tools/validate-all-maintainer.sh
new file mode 100755
index 000000000..a488385a1
--- /dev/null
+++ b/tools/validate-all-maintainer.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+TOPLEVEL=$(git rev-parse --show-toplevel)
+
+cd $TOPLEVEL
+
+git ls-files -z '*/Dockerfile' |
+    xargs -0 tools/validate-maintainer.sh || exit 1
+
diff --git a/tools/validate-maintainer.sh b/tools/validate-maintainer.sh
new file mode 100755
index 000000000..d6bb75a84
--- /dev/null
+++ b/tools/validate-maintainer.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+MAINTANER='MAINTAINER Kolla Project (https://launchpad.net/kolla)'
+RES=0
+
+for dockerfile in "$@"; do
+    if ! grep -q "$MAINTAINER" "$dockerfile"; then
+        echo "ERROR: $dockerfile has incorrect MAINTAINER" >&2
+        RES=1
+    fi
+done
+
+exit $RES
+
diff --git a/tox.ini b/tox.ini
index 286a71767..282dba038 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,3 +10,4 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = 
     {toxinidir}/tools/validate-all-json.sh
     {toxinidir}/tools/validate-all-yaml.sh
+    {toxinidir}/tools/validate-all-maintainer.sh