Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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 ed88f5101aafd1b5b8a7209e74fb44fe8f66d865..5d81bb1f57628179ed667e1d8b3a8aa83e6f2932 100644
(file)
--- a/
jjb/releng-templates-java.yaml
+++ b/
jjb/releng-templates-java.yaml
@@
-3,7
+3,9
@@
name: odl-maven-jobs
jobs:
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:
# 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
- gerrit-maven-verify-dependencies:
build-timeout: 180
+ mvn-version: mvn35
+
- job-template:
name: '{project-name}-integration-{stream}'
- job-template:
name: '{project-name}-integration-{stream}'
@@
-76,7
+80,7
@@
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
- maven-target:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
- maven-target:
- maven-version: 'mvn3
3
'
+ maven-version: 'mvn3
5
'
goals: |
{mvn-goals}
{opendaylight-infra-mvn-opts}
goals: |
{mvn-goals}
{opendaylight-infra-mvn-opts}
@@
-108,7
+112,9
@@
**/target/**/feature.xml
**/target/failsafe-reports/failsafe-summary.xml
**/target/surefire-reports/*-output.txt
**/target/**/feature.xml
**/target/failsafe-reports/failsafe-summary.xml
**/target/surefire-reports/*-output.txt
- mvn-version: mvn33
+ cron: '@daily'
+ mvn-opts: ''
+ mvn-version: mvn35
java-version: openjdk8
#####################
java-version: openjdk8
#####################
@@
-149,11
+155,13
@@
build-timeout: '{build-timeout}'
triggers:
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}'
- gerrit-trigger-patch-merged:
gerrit-server-name: '{gerrit-server-name}'
name: '{project}'
branch: '{branch}'
+ files: '**'
+ forbidden-files: ''
prebuilders:
- jacoco-nojava-workaround
prebuilders:
- jacoco-nojava-workaround
@@
-191,6
+199,3
@@
deploy-unstable: false
- lf-jacoco-report
- lf-infra-publish
deploy-unstable: false
- lf-jacoco-report
- lf-infra-publish
- - trigger:
- project: 'distribution-merge-{stream}'
- threshold: SUCCESS