X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Freleng-macros.yaml;h=eeff7a818e41ae9490e3f1dedfe4084dbd78d255;hb=0c0c7336c8942bb774d4b20b91e60a279ef76543;hp=6dd55984a4cf867f2f62d7d902913fbb984430ef;hpb=e69be0be2542ae801cb859f3812462ab5d25c849;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 6dd55984a..eeff7a818 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -1,5 +1,13 @@
 # OLD Releng macros
 
+- parameter:
+    name: project-parameter
+    parameters:
+        - string:
+            name: PROJECT
+            default: '{project}'
+            description: "JJB configured PROJECT parameter to identify an ODL Gerrit project"
+
 - parameter:
     name: gerrit-parameter
     parameters:
@@ -13,7 +21,7 @@
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: '{scm-url}'
+            url: '$GIT_BASE'
             refspec: ''
             branches:
                 - 'origin/{branch}'
@@ -25,19 +33,34 @@
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: '{scm-url}'
+            url: '$GIT_BASE'
             refspec: '{refspec}'
             branches:
                 - 'origin/$GERRIT_BRANCH'
             skip-tag: true
             choosing-strategy: '{choosing-strategy}'
 
+- wrapper:
+    name: build-timeout
+    wrappers:
+        - timeout:
+            type: elastic
+            elastic-percentage: 200
+            elastic-default-timeout: 180
+            fail: true
+
 - trigger:
     name: gerrit-trigger-patch-submitted
     triggers:
         - gerrit:
-            trigger-on-patchset-uploaded-event: true
-            trigger-on-draft-published-event: true
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'
@@ -49,7 +72,10 @@
     name: gerrit-trigger-patch-merged
     triggers:
         - gerrit:
-            trigger-on-change-merged-event: true
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'
@@ -74,3 +100,19 @@
             send-to:
                 - developers
                 - recipients
+
+- publisher:
+        name: jacoco-report
+        publishers:
+            - jacoco:
+                exec-pattern: "**/**.exec"
+                class-pattern: "**/classes"
+                source-pattern: "**/src/main/java"
+                status-update: true
+                targets:
+                  - branch:
+                      healthy: 10
+                      unhealthy: 20
+                  - method:
+                      healthy: 50
+                      unhealthy: 40