X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=2aa775fd6eeb60ecc28636ebfd191e9bb614c8a2;hb=8ed3422e519d114810acc42a3e62e17498717ce6;hp=1f812f038afdbac05968f02867e660389850b2d7;hpb=f181fcd9d772b4bc34f67949acd65c1afcfb502e;p=releng.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 1f812f038..2aa775fd6 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,6 +47,7 @@
                 - 'origin/$GERRIT_BRANCH'
             skip-tag: true
             choosing-strategy: '{choosing-strategy}'
+            timeout: 15
 
 - wrapper:
     name: build-timeout
@@ -56,6 +57,21 @@
             timeout: 360
             fail: true
 
+- trigger:
+    name: 'daily-trigger-disabled'
+    triggers:
+        - timed: ''
+
+- trigger:
+    name: 'weekly-trigger-disabled'
+    triggers:
+        - timed: ''
+
+- trigger:
+    name: 'brahmaputra-trigger-daily-enabled'
+    triggers:
+        - timed: '0 2 * * *'
+
 - trigger:
     name: gerrit-trigger-patch-submitted
     triggers:
@@ -163,8 +179,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
@@ -185,7 +201,7 @@
             echo "###########################"
             echo
 
-            gs_base="artifacts.opnfv.org/review"
+            gs_base="artifacts.opnfv.org/$PROJECT/review"
             gs_path="$gs_base/$GERRIT_CHANGE_NUMBER"
             local_path="upload/$GERRIT_CHANGE_NUMBER"
 
@@ -193,12 +209,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$' | \
@@ -229,12 +243,10 @@
             mv docs_output "$local_path"
             gsutil -m cp -r "$local_path" "gs://$GS_URL"
 
-            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$' | \
@@ -258,7 +270,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:
@@ -273,6 +286,13 @@
 
             [[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
 
+            gs_path="artifacts.opnfv.org/$PROJECT/review/$GERRIT_CHANGE_NUMBER"
+
+            if gsutil ls "gs://$gs_path" > /dev/null 2>&1 ; then
+                echo
+                echo "Deleting Out-of-dated Documents..."
+                gsutil -m rm -r "gs://$gs_path"
+            fi
             gs_path="artifacts.opnfv.org/review/$GERRIT_CHANGE_NUMBER"
 
             if gsutil ls "gs://$gs_path" > /dev/null 2>&1 ; then
@@ -281,6 +301,100 @@
                 gsutil -m rm -r "gs://$gs_path"
             fi
 
+- builder:
+    name: build-and-upload-artifacts-json-api
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o pipefail
+            export PATH=$PATH:/usr/local/bin/
+
+            virtualenv -p python2.7 $WORKSPACE/releng_artifacts
+            source $WORKSPACE/releng_artifacts/bin/activate
+
+            # install python packages
+            pip install google-api-python-client
+
+            # generate and upload index file
+            echo "Generating Artifacts API ..."
+            python $WORKSPACE/utils/opnfv-artifacts.py > index.json
+            gsutil cp index.json gs://artifacts.opnfv.org/index.json
+
+            deactivate
+
+- builder:
+    name: lint-python-code
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o pipefail
+            set -o xtrace
+            export PATH=$PATH:/usr/local/bin/
+
+            virtualenv -p python2.7 $WORKSPACE/releng_flake8
+            source $WORKSPACE/releng_flake8/bin/activate
+
+            # install python packages
+            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)"
+
+            # 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
+
+- builder:
+    name: report-lint-result-to-gerrit
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            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:
     name: upload-review-docs
     builders:
@@ -295,3 +409,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"