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
Do not leave staging repo open
[releng/builder.git]
/
jjb-templates
/
merge.yaml
diff --git
a/jjb-templates/merge.yaml
b/jjb-templates/merge.yaml
index 60339777e09b1bdc9a32c708991a60dd09189f19..c416ea8664659ae0016633c5cf2678e376c3c1fd 100644
(file)
--- a/
jjb-templates/merge.yaml
+++ b/
jjb-templates/merge.yaml
@@
-23,6
+23,10
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ - gerrit-parameter:
+ branch: '{branch}'
+ - gerrit-refspec-parameter:
+ refspec: 'refs/heads/{branch}'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-37,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}'
@@
-51,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}'