refactor email recipients to parameter with default value

[releng/builder.git] / jjb / releng-templates-java.yaml

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 5a224d285c3f1042efd8b270cd0623a950b11e9b..9904fa7b79fea124b0608c69afe17803bb41917c 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -40,7 +40,7 @@
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
@@ -55,17 +55,22 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-distribution-{stream}'
 
     # Required variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
+    # Need to keep jobs that deploy to Nexus at end of build as Maven
+    # projects. Maybe reconsider this once upstream moves deploy to a
+    # separate lifecycle:
+    #     https://issues.apache.org/jira/browse/MNG-5666
     project-type: maven
     node: '{build-node}'
     jdk: '{jdk}'
@@ -81,7 +86,7 @@
             project: 'integration/distribution'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
 
     scm:
         - git-scm:
@@ -103,7 +108,7 @@
             settings-file: '{mvn-settings}'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
         goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
@@ -114,13 +119,14 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project}]'
         - maven-deploy:
             id: ''
             unique-version: true
             deploy-unstable: false
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     # Template: {name}-distribution-check-{stream}
@@ -147,7 +153,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts} **/dependency_tree.txt'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
         - integration-distribution-git-url
 
     scm:
@@ -160,7 +166,11 @@
 
     wrappers:
         - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+            # Distro-check jobs typically run within 10 - 30 minutes
+            # with 45 minutes being the occassional edge case.
+            # enforce a 60 minute limit to ensure stuck jobs get
+            # cleared up sooner.
+            build-timeout: '60'
 
     triggers:
         - gerrit:
@@ -172,9 +182,7 @@
                     exclude-no-code-change: 'true'
                 - draft-published-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'test-distribution'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'redistcheck'
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
             projects:
@@ -191,7 +199,7 @@
 
     builders:
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: '$GERRIT_PROJECT/pom.xml'
             goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
@@ -201,7 +209,7 @@
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'distribution/pom.xml'
             goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
@@ -214,6 +222,7 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - postbuildscript:
             builders:
@@ -226,6 +235,8 @@
             mark-unstable-if-failed: True
         - archive:
             artifacts: '*.zip'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-integration-{stream}'
@@ -237,8 +248,8 @@
     # is successfully built.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
     project-type: freestyle
     node: '{build-node}'
@@ -277,7 +288,7 @@
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
               - '{mvn-opts}'
@@ -288,11 +299,12 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '{email-upstream}'
         - findbugs
         - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-merge-{stream}'
@@ -303,9 +315,13 @@
     # and deploy artifacts to Nexus.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
+    # Need to keep jobs that deploy to Nexus at end of build as Maven
+    # projects. Maybe reconsider this once upstream moves deploy to a
+    # separate lifecycle:
+    #     https://issues.apache.org/jira/browse/MNG-5666
     project-type: maven
     node: '{build-node}'
     jdk: '{jdk}'
@@ -345,7 +361,7 @@
             settings-file: '{mvn-settings}'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         goals: '{mvn-goals} -V -B -Djenkins -Dmerge -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '{mvn-opts}'
         settings: '{mvn-settings}'
@@ -368,7 +384,7 @@
             # project is configured in a certain way which ODL is not.
             steps:
             - maven-target:
-                maven-version: '{mvn33}'
+                maven-version: 'mvn33'
                 pom: pom.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
@@ -378,7 +394,7 @@
                 global-settings: 'odl-global-settings'
                 global-settings-type: cfp
             - maven-target:
-                maven-version: '{mvn33}'
+                maven-version: 'mvn33'
                 pom: deploy-site.xml
                 goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
@@ -393,14 +409,15 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - maven-deploy:
             id: ''
             unique-version: true
             deploy-unstable: false
         - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-periodic-{stream}'
@@ -411,8 +428,8 @@
     # builder.
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
     project-type: freestyle
     node: '{build-node}'
@@ -446,7 +463,7 @@
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
               - '{mvn-opts}'
@@ -457,17 +474,18 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
         - findbugs
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-sonar'
     disabled: false
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: 'openjdk8'
 
@@ -498,33 +516,41 @@
         - gerrit-trigger-patch-sonar:
             name: '{project}'
 
-    prebuilders:
+    builders:
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        goals: '{mvn-goals} -V -B -Djenkins -Dsonar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '{mvn-opts}'
-        settings: '{mvn-settings}'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    reporters:
-        - findbugs
+        - maven-target:
+            maven-version: 'mvn33'
+            goals: '{mvn-goals} -V -B -Djenkins -Dsonar -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            maven-opts:
+              - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+        - maven-target:
+            maven-version: 'mvn33'
+            # We should switch to the recommended configuration of sonar once
+            # JJB adds support for configurating the Sonar wrapper:
+            #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
+            goals: 'sonar:sonar -V -B -Djenkins -Dsonar -Dsonar.host.url=https://sonar.opendaylight.org -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            maven-opts:
+              - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
-        - sonar:
-            language: 'java'
-            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
+        - findbugs
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
@@ -580,8 +606,6 @@
                 - draft-published-event
                 - comment-added-contains-event:
                     comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
                 - comment-added-contains-event:
                     comment-contains-value: 'revalidate'
             projects:
@@ -599,7 +623,7 @@
         - autorelease-checkout-gerrit-patch
         - autorelease-generate-release-patches
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: validate-pom.xml
             goals: 'clean install dependency:tree -V -B -T1.5C -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
@@ -609,7 +633,7 @@
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
         - maven-target:
-            maven-version: '{mvn33}'
+            maven-version: 'mvn33'
             pom: 'pom.xml'
             goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
@@ -622,9 +646,10 @@
 
     publishers:
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[autorelease] [{project-name}]'
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -634,8 +659,8 @@
     # The purpose of this job template is to setup a ODL verify job
     #
     # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
+    #     stream:    release stream (eg. boron or carbon)
+    #     branch:    git branch (eg. stable/boron or master)
 
     project-type: freestyle
     node: '{build-node}'
@@ -684,7 +709,8 @@
     publishers:
         - findbugs
         - email-notification:
+            email-recipients: '{email-recipients}'
             email-prefix: '[{project-name}]'
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn-version}'