X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=2ebd7757b92849300ba0a4b73195e8fba5b99ea7;hb=afbde1ea089038b4cefe658e8fb7af4f454d7429;hp=eb4ee52bdc284053e9f496314a11d31617f1e4d4;hpb=9f410cf990048e6388d6f41289ebe6cd70185fc8;p=releng.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index eb4ee52bd..2ebd7757b 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -49,14 +49,6 @@
             choosing-strategy: '{choosing-strategy}'
             timeout: 15
 
-- wrapper:
-    name: build-timeout
-    wrappers:
-        - timeout:
-            type: absolute
-            timeout: 360
-            fail: true
-
 - trigger:
     name: 'daily-trigger-disabled'
     triggers:
@@ -67,11 +59,6 @@
     triggers:
         - timed: ''
 
-- trigger:
-    name: 'brahmaputra-trigger-daily-enabled'
-    triggers:
-        - timed: '0 2 * * *'
-
 - trigger:
     name: gerrit-trigger-patch-submitted
     triggers:
@@ -117,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:
@@ -209,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$' | \
@@ -243,14 +176,12 @@
 
             mkdir -p upload
             mv docs_output "$local_path"
-            gsutil -m cp -r "$local_path" "gs://$GS_URL"
+            gsutil -m cp -r "$local_path" "gs://$gs_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
+            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$' | \