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
Make Java version for CSIT jobs configurable
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index 7c6a1276d3f6d12fc3d08b70b2382ca304c6a869..4426e6b290a010111ec728bfb608a535aee807a6 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-56,7
+56,7
@@
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-136,7
+136,7
@@
- integration-patch-refspec:
branch: 'stable/helium'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'stable/helium'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-230,7
+230,7
@@
- project-parameter:
project: 'integration/test'
- integration-branch:
- project-parameter:
project: 'integration/test'
- integration-branch:
- branch: '
master
'
+ branch: '
stable/beryllium
'
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
@@
-242,7
+242,8
@@
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- jdkversion: 'openjdk7'
+ # Here {jdk} is taken from releng-defaults.yaml
+ jdkversion: '{jdk}'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-322,7
+323,7
@@
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-425,7
+426,7
@@
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-512,7
+513,7
@@
- project-parameter:
project: 'integration/test'
- integration-branch:
- project-parameter:
project: 'integration/test'
- integration-branch:
- branch: '
master
'
+ branch: '
stable/beryllium
'
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
- integration-bundleurl:
bundleurl: 'last'
- integration-controller-scope:
@@
-524,7
+525,7
@@
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-606,7
+607,7
@@
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-711,7
+712,7
@@
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- integration-patch-refspec:
branch: 'master'
- integration-jdk-version:
- jdkversion: '
openjdk7
'
+ jdkversion: '
{jdk}
'
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm: