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
/
genius
/
genius.yaml
diff --git
a/jjb/genius/genius.yaml
b/jjb/genius/genius.yaml
index 8fac19028ad1acc14403b6e95ebd0d017a7ec4b9..2bd0758bf99c28c92cf4037d638660ded13732f3 100644
(file)
--- a/
jjb/genius/genius.yaml
+++ b/
jjb/genius/genius.yaml
@@
-3,23
+3,17
@@
name: genius-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
name: genius-oxygen
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'
project-name: 'genius'
branch: 'master'
stream: oxygen
project: 'genius'
project-name: 'genius'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'genius-settings'
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},
@@
-27,7
+21,6
@@
openflowplugin-merge-{stream},
neutron-merge-{stream}
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
openflowplugin-merge-{stream},
neutron-merge-{stream}
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 96fb4b6d9d1ee
# Used by the release job
staging-profile-id: 96fb4b6d9d1ee
@@
-36,21
+29,14
@@
name: genius-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
name: genius-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: 'genius'
project-name: 'genius'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'genius'
project-name: 'genius'
branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'genius-settings'
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},
@@
-59,7
+45,6
@@
openflowplugin-merge-{stream},
neutron-merge-{stream}
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
openflowplugin-merge-{stream},
neutron-merge-{stream}
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 96fb4b6d9d1ee
# Used by the release job
staging-profile-id: 96fb4b6d9d1ee
@@
-68,22
+53,15
@@
name: genius-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
name: genius-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: 'genius'
project-name: 'genius'
branch: 'stable/carbon'
stream: carbon
project: 'genius'
project-name: 'genius'
branch: 'stable/carbon'
+ build-node: centos7-builder-2c-8g
karaf-version: karaf3
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'genius-settings'
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},
@@
-92,7
+70,6
@@
openflowplugin-merge-{stream},
neutron-merge-{stream}
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
openflowplugin-merge-{stream},
neutron-merge-{stream}
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 96fb4b6d9d1ee
# Used by the release job
staging-profile-id: 96fb4b6d9d1ee
@@
-100,10
+77,10
@@
- project:
name: genius-sonar
jobs:
- project:
name: genius-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'genius'
project-name: 'genius'
branch: 'master'
project: 'genius'
project-name: 'genius'
branch: 'master'
+ build-node: centos7-builder-2c-8g
mvn-settings: 'genius-settings'
mvn-settings: 'genius-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'