X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=7733abac49542332fb96dd729b9aa1936eaa2a79;hb=a546c809cd2c42b90f36355b63fd9c6bf3f4a2a1;hp=7fb4d653d4a140cf6f4895178dc809f6b01f32cc;hpb=25bf603fab75c3fd5a9626cc5af5dd4c5b6a2f07;p=releng.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 7fb4d653d..7733abac4 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -57,7 +57,12 @@
             fail: true
 
 - trigger:
-    name: 'brahmaputra-trigger-daily-disabled'
+    name: 'daily-trigger-disabled'
+    triggers:
+        - timed: ''
+
+- trigger:
+    name: 'weekly-trigger-disabled'
     triggers:
         - timed: ''
 
@@ -173,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
@@ -268,7 +273,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:
@@ -346,8 +352,11 @@
                 -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 \
                   -type f -name "*.py" -print | \
@@ -357,8 +366,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
@@ -372,14 +379,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"
+                     $GERRIT_PATCHSET_REVISION \
+                     --notify NONE"
+
+                exit 1
             fi
 
 - builder: