Enable Flake8 Checks on QTIP

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

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index c3459fd..a69badb 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -178,8 +178,8 @@
             set -o errexit
             set -o xtrace
             export PATH=$PATH:/usr/local/bin/
-            git clone ssh://gerrit.opnfv.org:29418/releng
-            GERRIT_COMMENT=gerrit_comment.txt ./releng/utils/docs-build.sh
+            git clone ssh://gerrit.opnfv.org:29418/opnfvdocs docs_build/_opnfvdocs
+            GERRIT_COMMENT=gerrit_comment.txt ./docs_build/_opnfvdocs/scripts/docs-build.sh
 
 - builder:
     name: upload-under-review-docs-to-opnfv-artifacts
@@ -349,13 +349,18 @@
             # empty string: ""
             FLAKE_COUNT="$(find . \
                 -path './releng_flake8' -prune -o \
+                -path './.tox' -prune -o \
                 -type f -name "*.py" -print | \
                 xargs flake8 --exit-zero -qq --count 2>&1)"
 
+            # Ensure we start with a clean environment
+            rm -f lint.log
+
             if [ ! -z $FLAKE_COUNT ]; then
-              echo "Flake8 Violations: $FLAKE_COUNT" >> lint.log
+              echo "Flake8 Violations: $FLAKE_COUNT" > lint.log
               find . \
                   -path './releng_flake8' -prune -o \
+                  -path './.tox' -prune -o \
                   -type f -name "*.py" -print | \
                   xargs flake8 --exit-zero --first >> violation.log
               SHOWN=$(wc -l violation.log | cut -d' ' -f1)
@@ -363,8 +368,6 @@
               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
@@ -378,15 +381,21 @@
             set -o pipefail
             set -o xtrace
             export PATH=$PATH:/usr/local/bin/
+
+            # If no violations were found, no lint log will exist.
             if [[ -e lint.log ]] ; then
                 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 \
                      --notify NONE"
+
+                exit 1
             fi
 
 - builder: