Indent Flake8 violations and include count

[releng.git] / jjb / releng-macros.yaml

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 3bac38a..5701ab9 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -339,8 +339,16 @@
             # generate and upload lint log
             echo "Running flake8 code on $PROJECT ..."
 
-            echo -e "Flake8 Violations\n-----------------" >> lint.log
-            find . -type f -name "*.py" | \
+            FLAKE_COUNT="$(find . \
+                -path './releng_flake8' -prune -o \
+                -type f -name "*.py" -print | \
+                xargs flake8 --exit-zero -qq --count 2>&1)"
+            echo -e "Flake8 Violations: $FLAKE_COUNT\n---" >> lint.log
+            # At some point this need to handle the case of finding no
+            # violations.
+            find . \
+                -path './releng_flake8' -prune -o \
+                -type f -name "*.py" -print | \
                 xargs flake8 --exit-zero --first >> lint.log
 
             deactivate
@@ -355,12 +363,13 @@
             set -o xtrace
             export PATH=$PATH:/usr/local/bin/
             if [[ -e lint.log ]] ; then
+                sed -r -i '3,$s/^/ /g' lint.log
                 echo -e "\nposting linting report to gerrit...\n"
                 cat lint.log
                 echo
                 ssh -p 29418 gerrit.opnfv.org \
                     "gerrit review -p $GERRIT_PROJECT \
-                     -m '$(cat lint.log)' \
+                     -m \"$(cat lint.log)\" \
                      $GERRIT_PATCHSET_REVISION"
             fi