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 "Configuration for Testing Live Migration"
[releng/builder.git]
/
jjb
/
releng-templates-java.yaml
diff --git
a/jjb/releng-templates-java.yaml
b/jjb/releng-templates-java.yaml
index 7df283921530c858d57305ea49e131fd68e0c948..4afb8dbdbdc806b4662051823ca40ad8ae42cfe2 100644
(file)
--- a/
jjb/releng-templates-java.yaml
+++ b/
jjb/releng-templates-java.yaml
@@
-21,6
+21,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}'
@@
-28,6
+30,12
@@
# Default parameters #
######################
# 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
#####################
mvn-goals: clean install
#####################
@@
-36,7
+44,7
@@
project-type: freestyle
node: '{build-node}'
project-type: freestyle
node: '{build-node}'
- jdk: '{j
dk
}'
+ jdk: '{j
ava-version
}'
properties:
- opendaylight-infra-properties:
properties:
- opendaylight-infra-properties:
@@
-70,7
+78,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}
@@
-96,6
+104,15
@@
# Default parameters #
######################
# 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
#####################
java-version: openjdk8
#####################
@@
-136,7
+153,7
@@
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}'
- gerrit-trigger-patch-merged:
gerrit-server-name: '{gerrit-server-name}'
name: '{project}'
@@
-147,10
+164,12
@@
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
- 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:
# TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
maven:
- maven-name: '
mvn33
'
+ maven-name: '
{mvn-version}
'
goals: >
{mvn-goals}
-Dmerge
goals: >
{mvn-goals}
-Dmerge