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
Switch to using new odl-maven-jobs group
[releng/builder.git]
/
jjb
/
reservation
/
reservation.yaml
diff --git
a/jjb/reservation/reservation.yaml
b/jjb/reservation/reservation.yaml
index a89a6411d546cc43fd5db43d90d1943f2702fcee..1e32c5d215fb6df24902daf122591b8518a2d3cd 100644
(file)
--- a/
jjb/reservation/reservation.yaml
+++ b/
jjb/reservation/reservation.yaml
@@
-1,21
+1,19
@@
+---
- project:
- project:
- name: reservation-
carbo
n
+ name: reservation-
oxyge
n
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-integration-{stream}'
+ - odl-maven-jobs
- stream:
carbo
n
+ stream:
oxyge
n
project: 'reservation'
project-name: 'reservation'
branch: 'master'
project: 'reservation'
project-name: 'reservation'
branch: 'master'
- jdk: openjdk8
jdks:
jdks:
-
- openjdk8
+ - openjdk8
maven:
maven:
-
- mvn33:
-
mvn-version: 'mvn33'
+ - mvn33:
+ mvn-version: 'mvn33'
mvn-settings: 'reservation-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-settings: 'reservation-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@
-23,24
+21,24
@@
email-upstream: '[reservation]'
archive-artifacts: ''
email-upstream: '[reservation]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a68d9bc504037
+
- project:
- project:
- name: reservation-
boro
n
+ name: reservation-
nitroge
n
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-integration-{stream}'
+ - odl-maven-jobs
- stream:
boro
n
+ stream:
nitroge
n
project: 'reservation'
project-name: 'reservation'
project: 'reservation'
project-name: 'reservation'
- branch: 'stable/boron'
- jdk: openjdk8
+ branch: 'stable/nitrogen'
jdks:
jdks:
-
- openjdk8
+ - openjdk8
maven:
maven:
-
- mvn33:
-
mvn-version: 'mvn33'
+ - mvn33:
+ mvn-version: 'mvn33'
mvn-settings: 'reservation-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-settings: 'reservation-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@
-48,25
+46,25
@@
email-upstream: '[reservation]'
archive-artifacts: ''
email-upstream: '[reservation]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a68d9bc504037
+
- project:
- project:
- name: reservation-
beryllium
+ name: reservation-
carbon
jobs:
jobs:
- - '{project-name}-clm-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-integration-{stream}'
+ - odl-maven-jobs
- stream:
beryllium
+ stream:
carbon
project: 'reservation'
project-name: 'reservation'
project: 'reservation'
project-name: 'reservation'
- branch: 'stable/
beryllium
'
- jdk: openjdk7
+ branch: 'stable/
carbon
'
+ karaf-version: karaf3
jdks:
jdks:
- - openjdk7
- - openjdk8
+ - openjdk8
maven:
maven:
-
- mvn33:
-
mvn-version: 'mvn33'
+ - mvn33:
+ mvn-version: 'mvn33'
mvn-settings: 'reservation-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-settings: 'reservation-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@
-74,10
+72,13
@@
email-upstream: '[reservation]'
archive-artifacts: ''
email-upstream: '[reservation]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a68d9bc504037
+
- project:
name: reservation-sonar
jobs:
- project:
name: reservation-sonar
jobs:
- - '{project-name}-sonar'
+ - gerrit-maven-sonar
project: 'reservation'
project-name: 'reservation'
branch: 'master'
project: 'reservation'
project-name: 'reservation'
branch: 'master'