refactor email recipients to parameter with default value

[releng/builder.git] / jjb / integration / integration-distribution-jobs.yaml

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 5013f52ab0805be74c14be363897518e45b3453d..486d164f3964efff5b4dc28752f342ca46be1a10 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -2,31 +2,32 @@
 - project:
     name: integration-distribution
     jobs:
-        - '{name}-verify-python-{stream}'
+        - '{project-name}-verify-python-{stream}'
         - 'integration-distribution-verify-{stream}'
         - 'integration-distribution-merge-{stream}'
         - 'integration-distribution-deploy-{stream}'
         - 'integration-distribution-offline-{stream}'
 
     project: integration/distribution
+    project-name: integration-distribution
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
 
 - job-template:
     name: 'integration-distribution-verify-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
     jdk: '{jre}'
 
@@ -37,12 +38,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'integration/distribution'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
 
@@ -56,7 +56,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-relevant-patch-submitted:
+        - gerrit-trigger-patch-submitted:
             name: 'integration/distribution'
             branch: '{branch}'
 
@@ -70,9 +70,9 @@
             settings-file: 'integration-settings'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dstream={stream}'
+        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: 'integration-settings'
         settings-type: cfp
@@ -88,19 +88,28 @@
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
 
-    publishers:
-        - email-notification:
-            email-prefix: '[integration]'
-        - archive-artifacts:
-            artifacts: '**/target/surefire-reports/*-output.txt, '
+    reporters:
         - findbugs
+
+    publishers:
         - jacoco-report
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
+        - email-notification:
+            email-recipients: '{email-recipients}'
+            email-prefix: '[int/dist]'
+
 
 - job-template:
     name: 'integration-distribution-merge-{stream}'
 
+    # 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: dynamic_merge
+    node: centos7-java-builder-2c-8g
     jdk: '{jre}'
 
     logrotate:
@@ -110,12 +119,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'integration/distribution'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt **/*.hprof'
 
     scm:
         - gerrit-trigger-scm:
@@ -140,9 +148,9 @@
             settings-file: 'integration-settings'
 
     maven:
-        maven-name: '{mvn33}'
+        maven-name: 'mvn33'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dmerge -Dstream={stream}'
+        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Djenkins -Dmerge -Dstream={stream}'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
         settings: 'integration-settings'
         settings-type: cfp
@@ -163,7 +171,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:
@@ -173,7 +181,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:
@@ -187,15 +195,16 @@
         - findbugs
 
     publishers:
-        - archive-artifacts:
-            artifacts: '**/target/surefire-reports/*-output.txt, '
-        - email-notification:
-            email-prefix: '[integration]'
         - maven-deploy:
             id: ''
             unique-version: true
             deploy-unstable: false
         - jacoco-report
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
+        - email-notification:
+            email-recipients: '{email-recipients}'
+            email-prefix: '[int/dist]'
 
 # Template: integration-distribution-deploy-{stream}
 # Goal: Verify distribution starts with no issues when all features are loaded
@@ -205,7 +214,7 @@
     name: 'integration-distribution-deploy-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     concurrent: true
 
     logrotate:
@@ -215,8 +224,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'integration/distribution'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts} **/*.hprof'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -239,10 +251,11 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[integration]'
+            email-recipients: '{email-recipients}'
+            email-prefix: '[int/dist]'
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'
 
 # Template: integration-distribution-offline-{stream}
 # Goal: Verify distribution can start with no internet connection
@@ -252,7 +265,7 @@
     name: 'integration-distribution-offline-{stream}'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -261,8 +274,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'integration/distribution'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts} **/*.hprof'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -285,7 +301,8 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[integration]'
+            email-recipients: '{email-recipients}'
+            email-prefix: '[int/dist]'
         - integration-csit-archive-build
-        - archive-build:
-            maven-version: '{mvn33}'
+        - opendaylight-infra-shiplogs:
+            maven-version: 'mvn33'