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 "adding vtnrenderer job to boron and beryllium branches"
[releng/builder.git]
/
jjb
/
integration
/
integration-distribution-jobs.yaml
diff --git
a/jjb/integration/integration-distribution-jobs.yaml
b/jjb/integration/integration-distribution-jobs.yaml
index e85e6374ff2d3b9237a7d7e247049232e7012eb4..ed1676c7b5bbbf6af56b02accfb0a1f9096802bf 100644
(file)
--- a/
jjb/integration/integration-distribution-jobs.yaml
+++ b/
jjb/integration/integration-distribution-jobs.yaml
@@
-11,14
+11,16
@@
stream:
- boron:
branch: 'master'
stream:
- boron:
branch: 'master'
+ jdk: 'openjdk8'
- beryllium:
branch: 'stable/beryllium'
- beryllium:
branch: 'stable/beryllium'
+ jdk: 'openjdk7'
- stable-lithium:
branch: 'stable/lithium'
- stable-lithium:
branch: 'stable/lithium'
+ jdk: 'openjdk7'
- stable-helium:
branch: 'stable/helium'
- stable-helium:
branch: 'stable/helium'
-
- jdk: 'openjdk7'
+ jdk: 'openjdk7'
- job-template:
- job-template:
@@
-164,7
+166,7
@@
- integration-bundleurl:
bundleurl: 'last'
- integration-jdk-version:
- integration-bundleurl:
bundleurl: 'last'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
wrappers:
- build-timeout
wrappers:
- build-timeout
@@
-213,7
+215,7
@@
- integration-bundleurl:
bundleurl: 'last'
- integration-jdk-version:
- integration-bundleurl:
bundleurl: 'last'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
wrappers:
- build-timeout
wrappers:
- build-timeout