Include count of shown flake8 violations

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

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 3bac38a..7fb4d65 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -339,9 +339,27 @@
             # generate and upload lint log
             echo "Running flake8 code on $PROJECT ..."
 
-            echo -e "Flake8 Violations\n-----------------" >> lint.log
-            find . -type f -name "*.py" | \
-                xargs flake8 --exit-zero --first >> lint.log
+            # Get number of flake8 violations. If none, this will be an
+            # empty string: ""
+            FLAKE_COUNT="$(find . \
+                -path './releng_flake8' -prune -o \
+                -type f -name "*.py" -print | \
+                xargs flake8 --exit-zero -qq --count 2>&1)"
+
+            if [ ! -z $FLAKE_COUNT ]; then
+              echo "Flake8 Violations: $FLAKE_COUNT" >> lint.log
+              find . \
+                  -path './releng_flake8' -prune -o \
+                  -type f -name "*.py" -print | \
+                  xargs flake8 --exit-zero --first >> violation.log
+              SHOWN=$(wc -l violation.log | cut -d' ' -f1)
+              echo -e "First $SHOWN shown\n---" >> lint.log
+              cat violation.log >> lint.log
+              sed -r -i '4,$s/^/ /g' lint.log
+              rm violation.log
+            else
+              echo -e "Flake8 Violations: 0" > lint.log
+            fi
 
             deactivate
 
@@ -360,7 +378,7 @@
                 echo
                 ssh -p 29418 gerrit.opnfv.org \
                     "gerrit review -p $GERRIT_PROJECT \
-                     -m '$(cat lint.log)' \
+                     -m \"$(cat lint.log)\" \
                      $GERRIT_PATCHSET_REVISION"
             fi