X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=3147c7eb1b6474a38bed00deb5e96f28caca1876;hb=c6dd8be243134ba5a87db1a2eb96b90452608f3d;hp=ed5803b20c986ed3cd4c6220c189d94e5954bb24;hpb=88c96a7e1007879aaa22e824f3a8baf82a1794d7;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index ed5803b20..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}'
-
-    project-type: maven
     node: '{build-node}'
+
+    project-type: freestyle
     concurrent: true
     jdk: '{jdk}'
 
@@ -191,7 +191,7 @@
                 unstable: false
                 notbuilt: false
 
-    prebuilders:
+    builders:
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
@@ -202,20 +202,16 @@
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-
-    maven:
-        maven-name: '{mvn33}'
-        root-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'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-        settings: '{mvn-settings}'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        ignore-upstream-changes: true
-        post-step-run-condition: 'SUCCESS'
-
-    postbuilders:
+        - maven-target:
+            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:
+              - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
         - integration-distribution-check
 
     publishers:
@@ -235,6 +231,8 @@
 
 - job-template:
     name: '{project-name}-integration-{stream}'
+    disabled: {disabled}
+    node: '{build-node}'
 
     # Job template for ODL integration verify jobs
     #
@@ -246,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:
@@ -277,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'
-        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
     #
@@ -315,7 +312,6 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
-    node: '{build-node}'
     jdk: '{jdk}'
 
     logrotate:
@@ -354,7 +350,7 @@
 
     maven:
         maven-name: '{mvn33}'
-        goals: '{mvn-goals} -V -B -Djenkins -Dmerge -Dstream={stream}'
+        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}'
         settings-type: cfp
@@ -412,6 +408,8 @@
 
 - job-template:
     name: '{project-name}-periodic-{stream}'
+    disabled: {disabled}
+    node: '{build-node}'
 
     # Job template for periodic builders
     #
@@ -422,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:
@@ -448,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'
-        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:
@@ -516,7 +511,7 @@
 
     maven:
         maven-name: '{mvn33}'
-        goals: '{mvn-goals} -V -B -Djenkins -Dsonar'
+        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
@@ -539,17 +534,14 @@
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
     disabled: '{obj:disable_autorelease}'
-
-    project-type: maven
     node: '{build-node}'
+
+    project-type: freestyle
     concurrent: true
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+        daysToKeep: '7'
 
     parameters:
         - opendaylight-infra-parameters:
@@ -607,7 +599,7 @@
                     - compare-type: ANT
                       pattern: '**/*.xml'
 
-    prebuilders:
+    builders:
         - jacoco-nojava-workaround
         - autorelease-checkout-gerrit-patch
         - autorelease-generate-release-patches
@@ -616,107 +608,33 @@
             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:
-            - '-Xmx8g'
+              - '-Xmx8g'
             settings: 'autorelease-settings'
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: 'autorelease-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        automatic-archiving: false
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - autorelease-sys-stats
-
-    publishers:
-        - email-notification:
-            email-prefix: '[autorelease] [{project-name}]'
-        - archive-build:
-            maven-version: '{mvn33}'
-
-- job-template:
-    name: '{project-name}-verify-{stream}'
-
-    # 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: matrix
-    node: matrix_master
-    concurrent: true
-
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - '{build-node}'
-        - axis:
-            type: jdk
-            values: '{obj:jdks}'
-
-    logrotate:
-        daysToKeep: '14'
-
-    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: '{mvn33}'
-            goals: '{mvn-goals} -V -B -Djenkins -Dstream={stream}'
+            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:
-                - '{mvn-opts}'
-            settings: '{mvn-settings}'
+              - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            settings: 'autorelease-settings'
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
+        - autorelease-sys-stats
 
     publishers:
-        - findbugs
         - email-notification:
-            email-prefix: '[{project-name}]'
-        - jacoco-report
+            email-prefix: '[autorelease] [{project-name}]'
         - archive-build:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'
+    disabled: {disabled}
+    node: '{build-node}'
 
     # Job template for ODL verify jobs
     #
@@ -727,7 +645,6 @@
     #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: freestyle
-    node: '{build-node}'
     concurrent: true
     jdk: '{jdks}'
 
@@ -762,7 +679,7 @@
             settings-file: '{mvn-settings}'
         - maven-target:
             maven-version: '{mvn-version}'
-            goals: '{mvn-goals} -V -B -Djenkins -Dstream={stream}'
+            goals: '{mvn-goals} -V -B -Djenkins -Dstream={stream} -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
                 - '{mvn-opts}'
             settings: '{mvn-settings}'