X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=a218d511894e69fa311f8c2ce5e45f7080406159;hb=a44c8b79ef888e24e0d0499f8005e07a60561244;hp=dfeb7cd3942acf93126dddcc68aa68e87f14eec5;hpb=e8201f1c159d0cc47a0af41849744b08197734a8;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index dfeb7cd39..a218d5118 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -6,10 +6,10 @@
     #   {mvn-settings} - Project maven settings file
     #   {stream}
     #   {jdk}
-    name: '{name}-clm-{stream}'
+    name: '{project-name}-clm-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -43,7 +43,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{mvn-settings}'
         settings-type: cfp
@@ -53,23 +53,23 @@
     postbuilders:
         - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
-            application-name: '{name}'
+            application-name: '{project-name}'
 
     publishers:
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-distribution-{stream}'
+    name: '{project-name}-distribution-{stream}'
 
     # Required variables:
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -80,10 +80,10 @@
 
     parameters:
         - opendaylight-infra-parameters:
-            project: '{project}'
+            project: 'integration/distribution'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt'
 
     scm:
         - git-scm:
@@ -107,7 +107,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        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'
         settings: 'integration-distribution-settings'
         settings-type: cfp
@@ -125,16 +125,16 @@
             maven-version: '{mvn33}'
 
 - job-template:
-    # Template: integration-patch-distribution-{stream}
+    # Template: {name}-distribution-check-{stream}
     # Goal: Build a patch and make sure the distribution can deploy with this change
     # Operation: This job template builds a patch, creates a distribution containing
     #            the patch, and triggers the distribution deploy test
 
-    name: '{name}-distribution-check-{stream}'
+    name: '{project-name}-distribution-check-{stream}'
     disabled: '{obj:disable_distribution_check}'
 
     project-type: maven
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
 
@@ -149,7 +149,7 @@
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+            artifacts: '{archive-artifacts} **/dependency_tree.txt'
         - integration-distribution-git-url
 
     scm:
@@ -181,7 +181,7 @@
                     comment-contains-value: 'recheck'
             projects:
               - project-compare-type: 'ANT'
-                project-pattern: '{name}'
+                project-pattern: '{project}'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
@@ -195,7 +195,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
-            goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            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:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: '{mvn-settings}'
@@ -206,7 +206,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'distribution/pom.xml'
-        goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        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'
         settings: '{mvn-settings}'
         settings-type: cfp
@@ -220,7 +220,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - postbuildscript:
             builders:
                 - shell: |
@@ -234,7 +234,7 @@
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-integration-{stream}'
+    name: '{project-name}-integration-{stream}'
 
     # Job template for ODL integration verify jobs
     #
@@ -247,7 +247,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -303,7 +303,7 @@
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-merge-{stream}'
+    name: '{project-name}-merge-{stream}'
 
     # Job template for ODL merge jobs
     #
@@ -315,7 +315,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_merge
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -401,7 +401,7 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - maven-deploy:
             id: ''
             unique-version: true
@@ -411,7 +411,7 @@
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-periodic-{stream}'
+    name: '{project-name}-periodic-{stream}'
 
     # Job template for periodic builders
     #
@@ -423,7 +423,7 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: dynamic_verify
+    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -468,17 +468,17 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - jacoco-report
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-sonar'
+    name: '{project-name}-sonar'
     disabled: false
 
     project-type: maven
-    node: dynamic_verify
+    node: '{build-node}'
     jdk: 'openjdk8'
 
     logrotate:
@@ -531,17 +531,17 @@
             language: 'java'
             maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - jacoco-report
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-validate-autorelease-{stream}'
+    name: '{project-name}-validate-autorelease-{stream}'
     disabled: '{obj:disable_autorelease}'
 
     project-type: maven
-    node: dynamic_verify
+    node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
 
@@ -614,7 +614,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: validate-pom.xml
-            goals: 'clean install -V -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            goals: 'clean install dependency:tree -V -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
             - '-Xmx8g'
             settings: 'autorelease-settings'
@@ -639,12 +639,12 @@
 
     publishers:
         - email-notification:
-            email-prefix: '[autorelease] [{name}]'
+            email-prefix: '[autorelease] [{project-name}]'
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
-    name: '{name}-verify-{stream}'
+    name: '{project-name}-verify-{stream}'
 
     # Job template for ODL verify jobs
     #
@@ -663,7 +663,7 @@
             type: slave
             name: nodes
             values:
-                - dynamic_verify
+                - '{build-node}'
         - axis:
             type: jdk
             values: '{obj:jdks}'
@@ -710,7 +710,70 @@
     publishers:
         - findbugs
         - email-notification:
-            email-prefix: '[{name}]'
+            email-prefix: '[{project-name}]'
         - jacoco-report
         - archive-build:
             maven-version: '{mvn33}'
+
+- job-template:
+    name: '{project-name}-verify-{stream}-{maven}-{jdk}'
+
+    # Job template for ODL verify jobs
+    #
+    # 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)
+
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: true
+    jdk: '{jdk}'
+
+    logrotate:
+        daysToKeep: '7'
+
+    parameters:
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
+
+    scm:
+        - gerrit-trigger-scm:
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: 'odl-global-settings'
+            settings-file: '{mvn-settings}'
+        - maven-target:
+            maven-version: '{mvn-version}'
+            goals: '{mvn-goals} -V -B -Djenkins -Dstream={stream}'
+            java-opts:
+                - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+
+    publishers:
+        - findbugs
+        - email-notification:
+            email-prefix: '[{project-name}]'
+        - jacoco-report
+        - archive-build:
+            maven-version: '{mvn-version}'