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
Remove mvn-goals for projects that use default
[releng/builder.git]
/
jjb
/
genius
/
genius.yaml
diff --git
a/jjb/genius/genius.yaml
b/jjb/genius/genius.yaml
index 61703e5d7f390806f921360c8dc06cae63141545..0e3f9bbd15a4002602fbf5035581e2524081bd40 100644
(file)
--- a/
jjb/genius/genius.yaml
+++ b/
jjb/genius/genius.yaml
@@
-4,9
+4,8
@@
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- '{project-name}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
odl-maven-jobs
stream: oxygen
project: 'genius'
stream: oxygen
project: 'genius'
@@
-18,8
+17,8
@@
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'genius-settings'
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'genius-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ build-timeout: 90
dependencies: >
controller-merge-{stream},
yangtools-merge-{stream},
dependencies: >
controller-merge-{stream},
yangtools-merge-{stream},
@@
-37,8
+36,7
@@
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: nitrogen
project: 'genius'
stream: nitrogen
project: 'genius'
@@
-50,7
+48,6
@@
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'genius-settings'
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'genius-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: >
controller-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: >
controller-merge-{stream},
@@
-69,8
+66,7
@@
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: carbon
project: 'genius'
stream: carbon
project: 'genius'
@@
-83,7
+79,6
@@
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'genius-settings'
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'genius-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: >
controller-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: >
controller-merge-{stream},
@@
-105,5
+100,4
@@
project-name: 'genius'
branch: 'master'
mvn-settings: 'genius-settings'
project-name: 'genius'
branch: 'master'
mvn-settings: 'genius-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'