Add surefire report to distribution and distribution-check jobs

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

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 22e741a216e232f7382b6c27ba34e68303f6949a..cb84eb8060cdc94f0463d20400ac618f8adc8755 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -8,7 +8,7 @@
     #   {jdk}
     name: '{project-name}-clm-{stream}'
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'
 
@@ -35,22 +35,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}'
@@ -58,7 +56,7 @@
     publishers:
         - email-notification:
             email-prefix: '[{project-name}]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -83,7 +81,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:
@@ -121,7 +119,7 @@
             id: ''
             unique-version: true
             deploy-unstable: false
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -133,7 +131,7 @@
     name: '{project-name}-distribution-check-{stream}'
     disabled: '{obj:disable_distribution_check}'
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
@@ -149,7 +147,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:
@@ -191,7 +189,7 @@
                 unstable: false
                 notbuilt: false
 
-    prebuilders:
+    builders:
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
@@ -202,20 +200,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:
@@ -230,7 +224,9 @@
             script-only-if-succeeded: False
             script-only-if-failed: False
             mark-unstable-if-failed: True
-        - archive-build:
+        - archive:
+            artifacts: '*.zip'
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -246,7 +242,7 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'
 
@@ -277,29 +273,27 @@
             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:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -407,7 +401,7 @@
             unique-version: true
             deploy-unstable: false
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -422,7 +416,7 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'
 
@@ -448,29 +442,27 @@
     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
-        - archive-build:
+        - findbugs
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -533,7 +525,7 @@
         - email-notification:
             email-prefix: '[{project-name}]'
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -546,10 +538,7 @@
     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:
@@ -636,7 +625,7 @@
     publishers:
         - email-notification:
             email-prefix: '[autorelease] [{project-name}]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -699,5 +688,5 @@
         - email-notification:
             email-prefix: '[{project-name}]'
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn-version}'