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
Switch all projects to use new maven-merge job
[releng/builder.git]
/
jjb
/
genius
/
genius.yaml
diff --git
a/jjb/genius/genius.yaml
b/jjb/genius/genius.yaml
index 61703e5d7f390806f921360c8dc06cae63141545..5e21d81bb2e0a83a018c203c81809744f3282619 100644
(file)
--- a/
jjb/genius/genius.yaml
+++ b/
jjb/genius/genius.yaml
@@
-6,7
+6,6
@@
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- - '{project-name}-merge-{stream}'
stream: oxygen
project: 'genius'
stream: oxygen
project: 'genius'
@@
-20,6
+19,7
@@
mvn-settings: 'genius-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-settings: 'genius-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ build-timeout: 90
dependencies: >
controller-merge-{stream},
yangtools-merge-{stream},
dependencies: >
controller-merge-{stream},
yangtools-merge-{stream},
@@
-38,7
+38,6
@@
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
stream: nitrogen
project: 'genius'
stream: nitrogen
project: 'genius'
@@
-70,7
+69,6
@@
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
stream: carbon
project: 'genius'
stream: carbon
project: 'genius'