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 "BUG-2625: validate alto using jdk8 only"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index 888586cc3f8115dca637906561d585d94a08c68e..3a4cade5e483d081b99f91ebc3a10e8eb37c94d4 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:
@@
-241,8
+241,7
@@
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- - integration-jdk-version:
- jdkversion: 'openjdk7'
+ # TODO: Use integration-jdk-version macro when switching to Boron
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-322,7
+321,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
+424,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:
@@
-523,8
+522,7
@@
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
test-options: '{robot-options}'
- integration-test-plan:
test-plan: '{project}-{functionality}.txt'
- - integration-jdk-version:
- jdkversion: 'openjdk7'
+ # TODO: Use integration-jdk-version macro when switching to Boron
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-606,7
+604,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
+709,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: