X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=3147c7eb1b6474a38bed00deb5e96f28caca1876;hb=bbb7864abce9a1e84ea972a03d3c2ce2a3574278;hp=6efb2c376db7612285ad6e31c2e8ef903f834500;hpb=0f7ddba01118813c3a06c9e2cccfcce357b43ed6;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 6efb2c376..3147c7eb1 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -7,9 +7,10 @@
     #   {stream}
     #   {jdk}
     name: '{project-name}-clm-{stream}'
-
-    project-type: maven
+    disabled: {disabled}
     node: '{build-node}'
+
+    project-type: freestyle
     jdk: '{jdk}'
 
     logrotate:
@@ -35,22 +36,20 @@
     triggers:
         - timed: 'H H * * 6'
 
-    prebuilders:
+    builders:
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        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
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    postbuilders:
+        - maven-target:
+            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:
+              - '-Xmx4096m -XX:MaxPermSize=512m'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
         - check-clm:
             application-name: '{project-name}'
@@ -63,13 +62,14 @@
 
 - job-template:
     name: '{project-name}-distribution-{stream}'
+    disabled: {disabled}
+    node: '{build-node}'
 
     # Required variables:
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -132,9 +132,9 @@
 
     name: '{project-name}-distribution-check-{stream}'
     disabled: '{obj:disable_distribution_check}'
+    node: '{build-node}'
 
     project-type: freestyle
-    node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
 
@@ -231,6 +231,8 @@
 
 - job-template:
     name: '{project-name}-integration-{stream}'
+    disabled: {disabled}
+    node: '{build-node}'
 
     # Job template for ODL integration verify jobs
     #
@@ -242,8 +244,7 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: maven
-    node: '{build-node}'
+    project-type: freestyle
     jdk: '{jdk}'
 
     logrotate:
@@ -273,33 +274,33 @@
             jobs: '{dependencies}'
             result: 'success'
 
-    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 -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 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
         - email-notification:
             email-prefix: '{email-upstream}'
+        - findbugs
         - jacoco-report
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-merge-{stream}'
+    disabled: {disabled}
+    node: '{build-node}'
 
     # Job template for ODL merge jobs
     #
@@ -311,7 +312,6 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -408,6 +408,8 @@
 
 - job-template:
     name: '{project-name}-periodic-{stream}'
+    disabled: {disabled}
+    node: '{build-node}'
 
     # Job template for periodic builders
     #
@@ -418,8 +420,7 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: maven
-    node: '{build-node}'
+    project-type: freestyle
     jdk: '{jdk}'
 
     logrotate:
@@ -444,37 +445,35 @@
     triggers:
         - timed: '@daily'
 
-    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 -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 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
         - email-notification:
             email-prefix: '[{project-name}]'
         - jacoco-report
+        - findbugs
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-sonar'
-    disabled: false
+    disabled: {disabled}
+    node: '{build-node}'
 
     project-type: maven
-    node: '{build-node}'
     jdk: 'openjdk8'
 
     logrotate:
@@ -535,9 +534,9 @@
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
     disabled: '{obj:disable_autorelease}'
+    node: '{build-node}'
 
     project-type: freestyle
-    node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
 
@@ -634,6 +633,8 @@
 
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'
+    disabled: {disabled}
+    node: '{build-node}'
 
     # Job template for ODL verify jobs
     #
@@ -644,7 +645,6 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
-    node: '{build-node}'
     concurrent: true
     jdk: '{jdks}'