X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-macros.yaml;h=516ceb05f11710586ea7518aa462dc8abe5889ad;hb=8928adcdb0ba785739bb9ab7bfa88b8d81b14493;hp=673a74b4e4a197af307515bac9afb06908da5f27;hpb=79e93def6e6547e9aaa170378afed310984a9291;p=releng%2Fbuilder.git

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 673a74b4e..516ceb05f 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,30 +21,48 @@
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: '{scm-url}'
+            url: '$GIT_BASE'
             refspec: ''
             branches:
                 - 'origin/{branch}'
             skip-tag: true
+            wipe-workspace: true
 
 - scm:
     name: gerrit-trigger-scm
     scm:
         - git:
             credentials-id: '{credentials-id}'
-            url: '{scm-url}'
+            url: '$GIT_BASE'
             refspec: '{refspec}'
             branches:
                 - 'origin/$GERRIT_BRANCH'
             skip-tag: true
-            choosing-strategy: gerrit
+            choosing-strategy: '{choosing-strategy}'
+
+- wrapper:
+    name: build-timeout
+    wrappers:
+        - timeout:
+            type: absolute
+            timeout: 360
+            fail: true
 
 - trigger:
     name: gerrit-trigger-patch-submitted
     triggers:
         - gerrit:
-            trigger-on-patchset-uploaded-event: true
-            trigger-on-draft-published-event: true
+            server-name: 'OpenDaylight'
+            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'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'
@@ -48,7 +74,11 @@
     name: gerrit-trigger-patch-merged
     triggers:
         - gerrit:
-            trigger-on-change-merged-event: true
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{name}'
@@ -56,6 +86,15 @@
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
 
+- publisher:
+    name: archive-artifacts
+    publishers:
+        - archive:
+            artifacts: '{artifacts}'
+            allow-empty: true
+            fingerprint: true
+            latest-only: true
+
 - publisher:
     name: email-notification
     publishers:
@@ -73,3 +112,37 @@
             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: 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'
+
+- builder:
+    name: check-clm
+    builders:
+        - sonatype-clm:
+            application-name: '{application-name}'
+            scan-targets: '**/target/**'