Update automated project templates

[releng/builder.git] / jjb / releng-macros.yaml

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index f41ad0ca16595d685319135909bcee0139178614..1f4b564e9d7916a6e2c8ab28a36f36b285ba7279 100644 (file)
--- 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,46 @@
     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: 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}'
@@ -48,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}'
@@ -60,11 +87,14 @@
     name: email-notification
     publishers:
         - email-ext:
-            recipients: '$DEFAULT_RECIPIENTS'
-            reply-to: '$DEFAULT_REPLYTO'
+            recipients: 'jenkins@lists.opendaylight.org'
+            reply-to:
             content-type: default
-            subject: '$DEFAULT_SUBJECT'
-            body: '$DEFAULT_CONTENT'
+            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: