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
Update automated project templates
[releng/builder.git]
/
jjb-templates
/
merge.yaml
diff --git
a/jjb-templates/merge.yaml
b/jjb-templates/merge.yaml
index db400f33f620e628370a072c620888d6aee9bfd3..d9ee40ff8c10f4cd5acaa5cc560ff3bf308f067b 100644
(file)
--- a/
jjb-templates/merge.yaml
+++ b/
jjb-templates/merge.yaml
@@
-15,8
+15,8
@@
jdk: '{jdk}'
logrotate:
jdk: '{jdk}'
logrotate:
- daysToKeep: '
{build-days-to-keep}
'
- numToKeep: '
{build-num-to-keep}
'
+ daysToKeep: '
14
'
+ numToKeep: '
10
'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
artifactNumToKeep: '{build-artifact-num-to-keep}'
artifactDaysToKeep: '{build-artifact-days-to-keep}'
artifactNumToKeep: '{build-artifact-num-to-keep}'
@@
-41,6
+41,7
@@
- '{ssh-credentials}'
triggers:
- '{ssh-credentials}'
triggers:
+ - timed: 'H H * * 0'
- gerrit-trigger-patch-merged:
name: 'PROJECT_PATH'
branch: '{branch}'
- gerrit-trigger-patch-merged:
name: 'PROJECT_PATH'
branch: '{branch}'
@@
-55,7
+56,7
@@
maven:
maven-name: '{mvn33}'
root-pom: 'POM'
maven:
maven-name: '{mvn33}'
root-pom: 'POM'
- goals: 'MAVEN_GOALS -Dmerge -Dstream={stream}'
+ goals: 'MAVEN_GOALS -D
jenkins -D
merge -Dstream={stream}'
maven-opts: 'MAVEN_OPTS'
settings: '{JENKINS_SETTINGS}'
global-settings: '{odl-global-settings}'
maven-opts: 'MAVEN_OPTS'
settings: '{JENKINS_SETTINGS}'
global-settings: '{odl-global-settings}'