Merge "Job for testing the ODL logs configuration"

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

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 3e9a0025b52d50401b23a7101db7b397eebce0d3..5d81bb1f57628179ed667e1d8b3a8aa83e6f2932 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -3,7 +3,9 @@
     name: odl-maven-jobs
 
     jobs:
-      - gerrit-maven-clm
+      # TODO: Add CLM jobs back once issue is resolved:
+      #       https://jira.linuxfoundation.org/browse/RELENG-1165
+      # - gerrit-maven-clm
 
       # TODO: Figure out what's wrong with the gerrit-maven-merge job.
       # - gerrit-maven-merge:
@@ -21,6 +23,8 @@
       - gerrit-maven-verify-dependencies:
           build-timeout: 180
 
+    mvn-version: mvn35
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
@@ -76,7 +80,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}
@@ -108,9 +112,9 @@
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
-    cron: 'H H * * 0'
+    cron: '@daily'
     mvn-opts: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     java-version: openjdk8
 
     #####################
@@ -156,6 +160,8 @@
           gerrit-server-name: '{gerrit-server-name}'
           name: '{project}'
           branch: '{branch}'
+          files: '**'
+          forbidden-files: ''
 
     prebuilders:
       - jacoco-nojava-workaround
@@ -193,6 +199,3 @@
           deploy-unstable: false
       - lf-jacoco-report
       - lf-infra-publish
-      - trigger:
-          project: 'distribution-merge-{stream}'
-          threshold: SUCCESS