X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=21812c7638d969c9aaf0aff7fd5a04511d4171d5;hb=c79f078e6b0e05d03027c3dc0f41402d12e62657;hp=7df283921530c858d57305ea49e131fd68e0c948;hpb=eb485a5e2af1828b63bb52cdb5ad0ce6e5dcfe55;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 7df283921..21812c763 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -16,11 +16,13 @@
           build-timeout: 180
           mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
 
-      - gerrit-maven-release
+      - gerrit-maven-stage
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
+    mvn-version: mvn35
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
@@ -28,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
 
     #####################
@@ -36,7 +44,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -70,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}
@@ -96,6 +104,15 @@
     # Default parameters #
     ######################
 
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+    cron: '@daily'
+    mvn-opts: ''
+    mvn-version: mvn35
     java-version: openjdk8
 
     #####################
@@ -136,21 +153,25 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 0'
+      - timed: '{obj:cron}'
       - gerrit-trigger-patch-merged:
           gerrit-server-name: '{gerrit-server-name}'
           name: '{project}'
           branch: '{branch}'
+          files: '**'
+          forbidden-files: ''
 
     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: 'mvn33'
+      maven-name: '{mvn-version}'
       goals: >
           {mvn-goals}
           -Dmerge
@@ -176,6 +197,3 @@
           deploy-unstable: false
       - lf-jacoco-report
       - lf-infra-publish
-      - trigger:
-          project: 'distribution-merge-{stream}'
-          threshold: SUCCESS