X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=d8866bdb0b14df8ef70270e7f440d2b52926b478;hb=e7d7573b9bc086783b6067d5b394e4e1d4de5933;hp=23d174a267636334013ebe592b8a80b0e0b4b61c;hpb=b3b6eaa50efc66862290c404a1d324f33cd77a84;p=releng.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 23d174a26..d8866bdb0 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -57,7 +57,7 @@
             fail: true
 
 - trigger:
-    name: 'brahmaputra-trigger-daily-disabled'
+    name: 'daily-trigger-disabled'
     triggers:
         - timed: ''
 
@@ -268,7 +268,8 @@
                 ssh -p 29418 gerrit.opnfv.org \
                     "gerrit review -p $GERRIT_PROJECT \
                      -m '$(cat gerrit_comment.txt)' \
-                     $GERRIT_PATCHSET_REVISION"
+                     $GERRIT_PATCHSET_REVISION \
+                     --notify NONE"
             fi
 
 - builder:
@@ -339,11 +340,27 @@
             # generate and upload lint log
             echo "Running flake8 code on $PROJECT ..."
 
-            echo -e "Flake8 Violations\n-----------------" >> lint.log
-            find . \
+            # 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 --first >> lint.log
+                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
 
@@ -357,14 +374,14 @@
             set -o xtrace
             export PATH=$PATH:/usr/local/bin/
             if [[ -e lint.log ]] ; then
-                sed -r -i '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)\" \
-                     $GERRIT_PATCHSET_REVISION"
+                     $GERRIT_PATCHSET_REVISION \
+                     --notify NONE"
             fi
 
 - builder: