X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Freleng-templates-java.yaml;h=4afb8dbdbdc806b4662051823ca40ad8ae42cfe2;hb=0bba121a62bf3a5c39533fa9bff0e4a1813b567f;hp=259ef196073b5628c9bce72103980f8ce92dfcfe;hpb=95d62ba8065ca3281fb2b6265411f6412fc67594;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 259ef1960..4afb8dbdb 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -5,18 +5,24 @@
     jobs:
       - gerrit-maven-clm
 
-      - gerrit-maven-merge:
-          post_build_trigger:
-            - project:
-                - 'distribution-merge-{stream}'
-              condition: SUCCESS
-              trigger-with-no-params: true
+      # TODO: Figure out what's wrong with the gerrit-maven-merge job.
+      # - gerrit-maven-merge:
+      #     post_build_trigger:
+      #       - project:
+      #           - 'distribution-merge-{stream}'
+      #         condition: SUCCESS
+      #         trigger-with-no-params: true
+      - '{project-name}-merge-{stream}':
+          build-timeout: 180
+          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
 
       - gerrit-maven-release
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
+    mvn-version: mvn35
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
@@ -24,6 +30,12 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
     mvn-goals: clean install
 
     #####################
@@ -32,7 +44,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -66,7 +78,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           goals: |
               {mvn-goals}
               {opendaylight-infra-mvn-opts}
@@ -84,3 +96,105 @@
       - findbugs
       - lf-jacoco-report
       - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-merge-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+    cron: 'H H * * 0'
+    mvn-opts: ''
+    mvn-version: mvn35
+    java-version: openjdk8
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    # 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: '{java-version}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - string:
+          name: STREAM
+          default: '{stream}'
+          description: "String representing release name"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '{obj:cron}'
+      - gerrit-trigger-patch-merged:
+          gerrit-server-name: '{gerrit-server-name}'
+          name: '{project}'
+          branch: '{branch}'
+
+    prebuilders:
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
+
+    # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
+    maven:
+      maven-name: '{mvn-version}'
+      goals: >
+          {mvn-goals}
+          -Dmerge
+          -Dstream={stream}
+          {opendaylight-infra-mvn-opts}
+      maven-opts: '{mvn-opts}'
+      settings: '{mvn-settings}'
+      settings-type: cfp
+      global-settings: 'global-settings'
+      global-settings-type: cfp
+      post-step-run-condition: UNSTABLE
+
+    reporters:
+      - findbugs
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - maven-deploy:
+          id: ''
+          unique-version: true
+          deploy-unstable: false
+      - lf-jacoco-report
+      - lf-infra-publish
+      - trigger:
+          project: 'distribution-merge-{stream}'
+          threshold: SUCCESS