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
Merge changes from topic 'cleanup-maven'
[releng/builder.git]
/
jjb
/
genius
/
genius.yaml
diff --git
a/jjb/genius/genius.yaml
b/jjb/genius/genius.yaml
index 9537c3e9d19022c8499e90e5bcc41e10f47904fc..32690ccf80dd4c09a1c8fe15877a476eb40ad5d9 100644
(file)
--- a/
jjb/genius/genius.yaml
+++ b/
jjb/genius/genius.yaml
@@
-2,24
+2,18
@@
- project:
name: genius-oxygen
jobs:
- project:
name: genius-oxygen
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-m
erge-{stream}
'
- -
'{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-m
aven-javadoc-jobs
'
+ -
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'
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},
@@
-29,26
+23,21
@@
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
archive-artifacts: ''
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: 96fb4b6d9d1ee
+
- project:
name: genius-nitrogen
jobs:
- project:
name: genius-nitrogen
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - 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'
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,27
+48,22
@@
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
archive-artifacts: ''
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: 96fb4b6d9d1ee
+
- project:
name: genius-carbon
jobs:
- project:
name: genius-carbon
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - odl-maven-jobs
stream: carbon
project: 'genius'
project-name: 'genius'
branch: 'stable/carbon'
karaf-version: karaf3
stream: carbon
project: 'genius'
project-name: 'genius'
branch: 'stable/carbon'
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},
@@
-90,13
+74,15
@@
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
archive-artifacts: ''
email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: 96fb4b6d9d1ee
+
- project:
name: genius-sonar
jobs:
- project:
name: genius-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'genius'
project-name: 'genius'
branch: 'master'
mvn-settings: 'genius-settings'
project: 'genius'
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'