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
Revert "Add a swap file to build machines"
[releng/builder.git]
/
jjb
/
reservation
/
reservation.yaml
diff --git
a/jjb/reservation/reservation.yaml
b/jjb/reservation/reservation.yaml
index 2269a92f0254a3e6b9f8ead615f9333baae7d5b2..47ae0223cb1147cce4fd4d46fd6c7ba559b0dd78 100644
(file)
--- a/
jjb/reservation/reservation.yaml
+++ b/
jjb/reservation/reservation.yaml
@@
-3,20
+3,13
@@
name: reservation-oxygen
jobs:
- '{project-name}-integration-{stream}'
name: reservation-oxygen
jobs:
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: oxygen
project: 'reservation'
project-name: 'reservation'
branch: 'master'
stream: oxygen
project: 'reservation'
project-name: 'reservation'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'reservation-settings'
mvn-settings: 'reservation-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[reservation]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[reservation]'
@@
-29,20
+22,13
@@
name: reservation-nitrogen
jobs:
- '{project-name}-integration-{stream}'
name: reservation-nitrogen
jobs:
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: nitrogen
project: 'reservation'
project-name: 'reservation'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'reservation'
project-name: 'reservation'
branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'reservation-settings'
mvn-settings: 'reservation-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[reservation]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[reservation]'
@@
-55,21
+41,14
@@
name: reservation-carbon
jobs:
- '{project-name}-integration-{stream}'
name: reservation-carbon
jobs:
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: carbon
project: 'reservation'
project-name: 'reservation'
branch: 'stable/carbon'
karaf-version: karaf3
stream: carbon
project: 'reservation'
project-name: 'reservation'
branch: 'stable/carbon'
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'reservation-settings'
mvn-settings: 'reservation-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[reservation]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[reservation]'
@@
-86,5
+65,4
@@
project-name: 'reservation'
branch: 'master'
mvn-settings: 'reservation-settings'
project-name: 'reservation'
branch: 'master'
mvn-settings: 'reservation-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'