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 unused {maven} variable
[releng/builder.git]
/
jjb
/
openflowplugin
/
openflowplugin.yaml
diff --git
a/jjb/openflowplugin/openflowplugin.yaml
b/jjb/openflowplugin/openflowplugin.yaml
index 588a41b5aa49039f2c0e2c03bc933ba705a99830..0ae23472a2766eb89b333536155e4b0990b6daea 100644
(file)
--- a/
jjb/openflowplugin/openflowplugin.yaml
+++ b/
jjb/openflowplugin/openflowplugin.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: 'openflowplugin'
stream: oxygen
project: 'openflowplugin'
@@
-14,12
+13,10
@@
branch: 'master'
jdks:
- openjdk8
branch: 'master'
jdks:
- openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'openflowplugin-settings'
mvn-settings: 'openflowplugin-settings'
- mvn-goals: 'clean
install
javadoc:aggregate'
+ mvn-goals: 'clean
deploy
javadoc:aggregate'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+ build-timeout: 90
dependencies: >
odlparent-merge-{stream},
yangtools-merge-{stream},
dependencies: >
odlparent-merge-{stream},
yangtools-merge-{stream},
@@
-36,9
+33,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: nitrogen
project: 'openflowplugin'
stream: nitrogen
project: 'openflowplugin'
@@
-46,11
+42,8
@@
branch: 'stable/nitrogen'
jdks:
- openjdk8
branch: 'stable/nitrogen'
jdks:
- openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'openflowplugin-settings'
mvn-settings: 'openflowplugin-settings'
- mvn-goals: 'clean
install
javadoc:aggregate'
+ mvn-goals: 'clean
deploy
javadoc:aggregate'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: >
odlparent-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: >
odlparent-merge-{stream},
@@
-68,22
+61,18
@@
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: carbon
project: 'openflowplugin'
project-name: 'openflowplugin'
branch: 'stable/carbon'
stream: carbon
project: 'openflowplugin'
project-name: 'openflowplugin'
branch: 'stable/carbon'
- karaf-version:
karaf3
+ karaf-version:
'karaf3'
jdks:
- openjdk8
jdks:
- openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'openflowplugin-settings'
mvn-settings: 'openflowplugin-settings'
- mvn-goals: 'clean
install
javadoc:aggregate'
+ mvn-goals: 'clean
deploy
javadoc:aggregate'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: >
odlparent-merge-{stream},
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: >
odlparent-merge-{stream},
@@
-99,10
+88,10
@@
- project:
name: openflowplugin-sonar
jobs:
- project:
name: openflowplugin-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'openflowplugin'
project-name: 'openflowplugin'
branch: 'master'
mvn-settings: 'openflowplugin-settings'
project: 'openflowplugin'
project-name: 'openflowplugin'
branch: 'master'
mvn-settings: 'openflowplugin-settings'
- mvn-goals: 'clean
install
javadoc:aggregate'
+ mvn-goals: 'clean
deploy
javadoc:aggregate'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'