Revert "Strengthen distribution-check"

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

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 95777c11149308a68aeaacbb4f1e03f9457f7d77..1226b9ca8b6ac0ed8bd51148cfe75f4b2f7d2e04 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -56,7 +56,7 @@
     publishers:
         - email-notification:
             email-prefix: '[{project-name}]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -66,6 +66,10 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
+    # 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: '{build-node}'
     jdk: '{jdk}'
@@ -81,7 +85,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:
@@ -119,7 +123,7 @@
             id: ''
             unique-version: true
             deploy-unstable: false
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -147,7 +151,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:
@@ -224,7 +228,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:
@@ -291,7 +297,7 @@
             email-prefix: '{email-upstream}'
         - findbugs
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -306,6 +312,10 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
+    # 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: '{build-node}'
     jdk: '{jdk}'
@@ -399,7 +409,7 @@
             unique-version: true
             deploy-unstable: false
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -460,14 +470,14 @@
             email-prefix: '[{project-name}]'
         - jacoco-report
         - findbugs
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
     name: '{project-name}-sonar'
     disabled: false
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: 'openjdk8'
 
@@ -498,32 +508,39 @@
         - gerrit-trigger-patch-sonar:
             name: '{project}'
 
-    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 -Dsonar -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 -Dsonar -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
+        - maven-target:
+            maven-version: '{mvn33}'
+            # We should switch to the recommended configuration of sonar once
+            # JJB adds support for configurating the Sonar wrapper:
+            #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
+            goals: 'sonar:sonar -V -B -Djenkins -Dsonar -Dsonar.host.url=https://sonar.opendaylight.org -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
 
     publishers:
-        - sonar:
-            language: 'java'
-            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
         - email-notification:
             email-prefix: '[{project-name}]'
         - jacoco-report
-        - archive-build:
+        - findbugs
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -623,7 +640,7 @@
     publishers:
         - email-notification:
             email-prefix: '[autorelease] [{project-name}]'
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 - job-template:
@@ -686,5 +703,5 @@
         - email-notification:
             email-prefix: '[{project-name}]'
         - jacoco-report
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn-version}'