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
/
l2switch
/
l2switch.yaml
diff --git
a/jjb/l2switch/l2switch.yaml
b/jjb/l2switch/l2switch.yaml
index 147264acd62b3da6459ccc7602a17c3c5bc38f06..36eb6bc77167dd40e891b6022ec7372825d55a3d 100644
(file)
--- a/
jjb/l2switch/l2switch.yaml
+++ b/
jjb/l2switch/l2switch.yaml
@@
-4,8
+4,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: oxygen
project: 'l2switch'
stream: oxygen
project: 'l2switch'
@@
-17,7
+16,6
@@
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'l2switch-settings'
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'l2switch-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
@@
-36,8
+34,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: 'l2switch'
stream: nitrogen
project: 'l2switch'
@@
-49,7
+46,6
@@
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'l2switch-settings'
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'l2switch-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
@@
-68,8
+64,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: 'l2switch'
stream: carbon
project: 'l2switch'
@@
-82,7
+77,6
@@
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'l2switch-settings'
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'l2switch-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
dependencies: >
odlparent-merge-{stream},
@@
-99,10
+93,9
@@
- project:
name: l2switch-sonar
jobs:
- project:
name: l2switch-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'l2switch'
project-name: 'l2switch'
branch: 'master'
mvn-settings: 'l2switch-settings'
project: 'l2switch'
project-name: 'l2switch'
branch: 'master'
mvn-settings: 'l2switch-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'