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 "Combine SFC clustering jobs into SFC Rest Basic to reduce number of jenkins"
[releng/builder.git]
/
jjb
/
odlparent
/
odlparent.yaml
diff --git
a/jjb/odlparent/odlparent.yaml
b/jjb/odlparent/odlparent.yaml
index 8a6a88eaabdae1a9c55a3e6433cb8bd3b6f8bb79..c157d14dd93e448d1b297b6f54d3cc1bdc28d3df 100644
(file)
--- a/
jjb/odlparent/odlparent.yaml
+++ b/
jjb/odlparent/odlparent.yaml
@@
-1,6
+1,5
@@
-# ODL Releng build templates
- project:
- project:
- name: odlparent-
bor
on
+ name: odlparent-
carb
on
jobs:
- '{project-name}-clm-{stream}'
- '{project-name}-distribution-{stream}'
jobs:
- '{project-name}-clm-{stream}'
- '{project-name}-distribution-{stream}'
@@
-9,12
+8,12
@@
- '{project-name}-merge-{stream}'
- '{project-name}-periodic-{stream}'
- '{project-name}-validate-autorelease-{stream}'
- '{project-name}-merge-{stream}'
- '{project-name}-periodic-{stream}'
- '{project-name}-validate-autorelease-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdk}'
+ - '{project-name}-verify-{stream}-{maven}-{jdk
s
}'
# stream: release stream (eg. stable-lithium or beryllium)
# branch: git branch (eg. stable/lithium or master)
stream:
# stream: release stream (eg. stable-lithium or beryllium)
# branch: git branch (eg. stable/lithium or master)
stream:
- -
bor
on:
+ -
carb
on:
disable_autorelease: False
disable_distribution_check: False
disable_autorelease: False
disable_distribution_check: False
@@
-22,18
+21,20
@@
project-name: 'odlparent'
branch: 'master'
jdk: openjdk8
project-name: 'odlparent'
branch: 'master'
jdk: openjdk8
+ jdks:
+ - openjdk8
maven:
- mvn33:
mvn-version: '{mvn33}'
mvn-settings: 'odlparent-settings'
maven:
- mvn33:
mvn-version: '{mvn33}'
mvn-settings: 'odlparent-settings'
- mvn-goals: 'clean install
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
'
+ mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[odlparent]'
archive-artifacts: ''
- project:
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[odlparent]'
archive-artifacts: ''
- project:
- name: odlparent-b
eryllium
+ name: odlparent-b
oron
jobs:
- '{project-name}-clm-{stream}'
- '{project-name}-distribution-{stream}'
jobs:
- '{project-name}-clm-{stream}'
- '{project-name}-distribution-{stream}'
@@
-42,34
+43,33
@@
- '{project-name}-merge-{stream}'
- '{project-name}-periodic-{stream}'
- '{project-name}-validate-autorelease-{stream}'
- '{project-name}-merge-{stream}'
- '{project-name}-periodic-{stream}'
- '{project-name}-validate-autorelease-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdk}'
+ - '{project-name}-verify-{stream}-{maven}-{jdk
s
}'
# stream: release stream (eg. stable-lithium or beryllium)
# branch: git branch (eg. stable/lithium or master)
stream:
# stream: release stream (eg. stable-lithium or beryllium)
# branch: git branch (eg. stable/lithium or master)
stream:
- - b
eryllium
:
+ - b
oron
:
disable_autorelease: False
disable_distribution_check: False
project: 'odlparent'
project-name: 'odlparent'
disable_autorelease: False
disable_distribution_check: False
project: 'odlparent'
project-name: 'odlparent'
- branch: 'stable/b
eryllium
'
- jdk:
- - openjdk7
+ branch: 'stable/b
oron
'
+ jdk:
openjdk8
+ jdks:
- openjdk8
maven:
- mvn33:
mvn-version: '{mvn33}'
mvn-settings: 'odlparent-settings'
- openjdk8
maven:
- mvn33:
mvn-version: '{mvn33}'
mvn-settings: 'odlparent-settings'
- mvn-goals: 'clean install
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
'
+ mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[odlparent]'
archive-artifacts: ''
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[odlparent]'
archive-artifacts: ''
-# ODL Releng build templates
- project:
- project:
- name: odlparent-
lith
ium
+ name: odlparent-
beryll
ium
jobs:
- '{project-name}-clm-{stream}'
- '{project-name}-distribution-{stream}'
jobs:
- '{project-name}-clm-{stream}'
- '{project-name}-distribution-{stream}'
@@
-78,24
+78,27
@@
- '{project-name}-merge-{stream}'
- '{project-name}-periodic-{stream}'
- '{project-name}-validate-autorelease-{stream}'
- '{project-name}-merge-{stream}'
- '{project-name}-periodic-{stream}'
- '{project-name}-validate-autorelease-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdk}'
+ - '{project-name}-verify-{stream}-{maven}-{jdk
s
}'
# stream: release stream (eg. stable-lithium or beryllium)
# branch: git branch (eg. stable/lithium or master)
stream:
# stream: release stream (eg. stable-lithium or beryllium)
# branch: git branch (eg. stable/lithium or master)
stream:
- -
stable-lith
ium:
- disable_autorelease:
Tru
e
- disable_distribution_check:
Tru
e
+ -
beryll
ium:
+ disable_autorelease:
Fals
e
+ disable_distribution_check:
Fals
e
project: 'odlparent'
project-name: 'odlparent'
project: 'odlparent'
project-name: 'odlparent'
- branch: 'stable/
lith
ium'
+ branch: 'stable/
beryll
ium'
jdk: openjdk7
jdk: openjdk7
+ jdks:
+ - openjdk7
+ - openjdk8
maven:
- mvn33:
mvn-version: '{mvn33}'
mvn-settings: 'odlparent-settings'
maven:
- mvn33:
mvn-version: '{mvn33}'
mvn-settings: 'odlparent-settings'
- mvn-goals: 'clean install
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
'
+ mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[odlparent]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[odlparent]'
@@
-106,14
+109,9
@@
jobs:
- '{project-name}-sonar'
jobs:
- '{project-name}-sonar'
- # stream: release stream (eg. stable-lithium or beryllium)
- # branch: git branch (eg. stable/lithium or master)
- stream:
- - boron:
- branch: 'master'
-
project: 'odlparent'
project-name: 'odlparent'
project: 'odlparent'
project-name: 'odlparent'
+ branch: 'master'
mvn-settings: 'odlparent-settings'
mvn-settings: 'odlparent-settings'
- mvn-goals: 'clean install
-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
'
+ mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'