X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=3afd355e6087ff085590809776fe6ddef7614501;hb=e1001a2789cfb7af9f8ae269e04a6d0750c7d1f3;hp=5701ab9bfab1ec0375fe9069580092f9d9e81e39;hpb=2d716408a20e3995908308d56e7b654cb5b8ce84;p=releng.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 5701ab9bf..3afd355e6 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -13,7 +13,7 @@
             description: "URL to Google Storage."
         - string:
             name: GS_BASE_PROXY
-            default: build.opnfv.org/artifacts/$PROJECT
+            default: build.opnfv.org/artifacts.opnfv.org/$PROJECT
             description: "URL to Google Storage proxy"
 
 - parameter:
@@ -47,24 +47,17 @@
                 - 'origin/$GERRIT_BRANCH'
             skip-tag: true
             choosing-strategy: '{choosing-strategy}'
-
-- wrapper:
-    name: build-timeout
-    wrappers:
-        - timeout:
-            type: absolute
-            timeout: 360
-            fail: true
+            timeout: 15
 
 - trigger:
-    name: 'brahmaputra-trigger-daily-disabled'
+    name: 'daily-trigger-disabled'
     triggers:
         - timed: ''
 
 - trigger:
-    name: 'brahmaputra-trigger-daily-enabled'
+    name: 'weekly-trigger-disabled'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
 
 - trigger:
     name: gerrit-trigger-patch-submitted
@@ -111,58 +104,6 @@
             fingerprint: true
             latest-only: true
 
-- publisher:
-    name: email-notification
-    publishers:
-        - email-ext:
-            recipients: 'jenkins@lists.opnfv.org'
-            reply-to:
-            content-type: default
-            subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'
-            body: |
-                $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS:
-
-                Check console output at $BUILD_URL to view the results.
-            unstable: true
-            fixed: true
-            send-to:
-                - developers
-                - recipients
-
-- publisher:
-        name: jacoco-report
-        publishers:
-            - jacoco:
-                exec-pattern: "**/**.exec"
-                class-pattern: "**/classes"
-                source-pattern: "**/src/main/java"
-                exclusion-pattern: "**/gen/**,**/generated-sources/**,**/yang-gen**"
-                status-update: true
-                targets:
-                  - branch:
-                      healthy: 10
-                      unhealthy: 20
-                  - method:
-                      healthy: 50
-                      unhealthy: 40
-
-
-- builder:
-    name: test-macro
-    builders:
-        - shell: 'echo testing macro "test-macro"'
-
-- builder:
-    name: wipe-org-opendaylight-repo
-    builders:
-        - shell: 'if [ -d /tmp/r/org/opendaylight ]; then rm -rf /tmp/r/org/opendaylight; fi'
-
-- builder:
-    name: jacoco-nojava-workaround
-    builders:
-        - shell: 'mkdir -p $WORKSPACE/target/classes'
-
-
 # New Releng macros
 
 - builder:
@@ -173,8 +114,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
@@ -203,12 +144,10 @@
             mv docs_output "$local_path"
             gsutil -m cp -r "$local_path" "gs://$gs_base"
 
-            if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
-                gsutil -m setmeta \
-                    -h "Content-Type:text/html" \
-                    -h "Cache-Control:private, max-age=0, no-transform" \
-                    "gs://$gs_path"/**.html
-            fi
+            gsutil -m setmeta \
+                -h "Content-Type:text/html" \
+                -h "Cache-Control:private, max-age=0, no-transform" \
+                "gs://$gs_path"/**.html > /dev/null 2>&1
 
             echo "Document link(s):" >> gerrit_comment.txt
             find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \
@@ -232,19 +171,23 @@
             echo "########################"
             echo
 
+            echo "gs_path="$GS_URL/docs""
+            echo "local_path="upload/docs""
+
             gs_path="$GS_URL/docs"
             local_path="upload/docs"
 
             mkdir -p upload
             mv docs_output "$local_path"
-            gsutil -m cp -r "$local_path" "gs://$GS_URL"
+            ls "$local_path"
 
-            if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then
-                gsutil -m setmeta \
-                    -h "Content-Type:text/html" \
-                    -h "Cache-Control:private, max-age=0, no-transform" \
-                    "gs://$gs_path"/**.html
-            fi
+            echo "gsutil -m cp -r "$local_path"/* "gs://$gs_path""
+            gsutil -m cp -r "$local_path"/* "gs://$gs_path"
+
+            gsutil -m setmeta \
+                -h "Content-Type:text/html" \
+                -h "Cache-Control:private, max-age=0, no-transform" \
+                "gs://$gs_path"/**.html > /dev/null 2>&1
 
             echo "Document link(s):" >> gerrit_comment.txt
             find "$local_path" | grep -e 'index.html$' -e 'pdf$' | \
@@ -268,7 +211,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:
@@ -334,22 +278,35 @@
             source $WORKSPACE/releng_flake8/bin/activate
 
             # install python packages
-            pip install flake8
+            pip install "flake8==2.6.2"
 
             # generate and upload lint log
             echo "Running flake8 code on $PROJECT ..."
 
+            # Get number of flake8 violations. If none, this will be an
+            # 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)"
-            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
+
+            # Ensure we start with a clean environment
+            rm -f lint.log
+
+            if [ ! -z $FLAKE_COUNT ]; then
+              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)
+              echo -e "First $SHOWN shown\n---" >> lint.log
+              cat violation.log >> lint.log
+              sed -r -i '4,$s/^/ /g' lint.log
+              rm violation.log
+            fi
 
             deactivate
 
@@ -362,15 +319,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
-                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)\" \
-                     $GERRIT_PATCHSET_REVISION"
+                     $GERRIT_PATCHSET_REVISION \
+                     --notify NONE"
+
+                exit 1
             fi
 
 - builder:
@@ -387,3 +350,8 @@
         - upload-generated-docs-to-opnfv-artifacts
         - report-docs-build-result-to-gerrit
         - remove-old-docs-from-opnfv-artifacts
+
+- builder:
+    name: check-bash-syntax
+    builders:
+        - shell: "find . -name '*.sh' | xargs bash -n"