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 {project}-integration-{stream} jobs
[releng/builder.git]
/
jjb
/
unimgr
/
unimgr.yaml
diff --git
a/jjb/unimgr/unimgr.yaml
b/jjb/unimgr/unimgr.yaml
index 2e0441ed01197da63c01d700bb26aa384d907a6c..65e659cbc3d90b8cedd8f51624fba5a06e53c8f3 100644
(file)
--- a/
jjb/unimgr/unimgr.yaml
+++ b/
jjb/unimgr/unimgr.yaml
@@
-3,25
+3,16
@@
name: unimgr-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
name: unimgr-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: oxygen
project: 'unimgr'
project-name: 'unimgr'
branch: 'master'
stream: oxygen
project: 'unimgr'
project-name: 'unimgr'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'unimgr-settings'
mvn-settings: 'unimgr-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'ovsdb-merge-{stream}'
email-upstream: '[unimgr] [ovsdb]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'ovsdb-merge-{stream}'
email-upstream: '[unimgr] [ovsdb]'
- archive-artifacts: ''
build-node: centos7-builder-4c-16g
# Used by the release job
build-node: centos7-builder-4c-16g
# Used by the release job
@@
-31,25
+22,16
@@
name: unimgr-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
name: unimgr-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: nitrogen
project: 'unimgr'
project-name: 'unimgr'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'unimgr'
project-name: 'unimgr'
branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'unimgr-settings'
mvn-settings: 'unimgr-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'ovsdb-merge-{stream}'
email-upstream: '[unimgr] [ovsdb]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'ovsdb-merge-{stream}'
email-upstream: '[unimgr] [ovsdb]'
- archive-artifacts: ''
build-node: centos7-builder-4c-16g
# Used by the release job
build-node: centos7-builder-4c-16g
# Used by the release job
@@
-59,26
+41,17
@@
name: unimgr-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
name: unimgr-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: carbon
project: 'unimgr'
project-name: 'unimgr'
branch: 'stable/carbon'
karaf-version: karaf3
stream: carbon
project: 'unimgr'
project-name: 'unimgr'
branch: 'stable/carbon'
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'unimgr-settings'
mvn-settings: 'unimgr-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'ovsdb-merge-{stream}'
email-upstream: '[unimgr] [ovsdb]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'ovsdb-merge-{stream}'
email-upstream: '[unimgr] [ovsdb]'
- archive-artifacts: ''
build-node: centos7-builder-4c-16g
# Used by the release job
build-node: centos7-builder-4c-16g
# Used by the release job
@@
-92,5
+65,4
@@
project-name: 'unimgr'
branch: 'master'
mvn-settings: 'unimgr-settings'
project-name: 'unimgr'
branch: 'master'
mvn-settings: 'unimgr-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'