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
Rework the way Java version is set in CSIT jobs
[releng/builder.git]
/
jjb
/
integration
/
integration-test-jobs.yaml
diff --git
a/jjb/integration/integration-test-jobs.yaml
b/jjb/integration/integration-test-jobs.yaml
index 3da167f62c9a585ca8427cd08274ebcb35060846..3d84b991499767293fecfdac844113b919fbc5e1 100644
(file)
--- a/
jjb/integration/integration-test-jobs.yaml
+++ b/
jjb/integration/integration-test-jobs.yaml
@@
-12,6
+12,7
@@
- boron:
branch: 'master'
jdk: 'openjdk8'
- boron:
branch: 'master'
jdk: 'openjdk8'
+ jre: 'openjdk8'
csit-list: >
aaa-csit-1node-authn-only-{stream},
aaa-csit-1node-authn-all-{stream},
csit-list: >
aaa-csit-1node-authn-only-{stream},
aaa-csit-1node-authn-all-{stream},
@@
-74,6
+75,7
@@
- beryllium:
branch: 'stable/beryllium'
jdk: 'openjdk7'
- beryllium:
branch: 'stable/beryllium'
jdk: 'openjdk7'
+ jre: 'openjdk7'
csit-list: >
aaa-csit-1node-authn-only-{stream},
aaa-csit-1node-authn-all-{stream},
csit-list: >
aaa-csit-1node-authn-only-{stream},
aaa-csit-1node-authn-all-{stream},
@@
-138,6
+140,7
@@
- stable-lithium:
branch: 'stable/lithium'
jdk: 'openjdk7'
- stable-lithium:
branch: 'stable/lithium'
jdk: 'openjdk7'
+ jre: 'openjdk7'
csit-list: >
aaa-csit-1node-authn-only-{stream},
aaa-csit-1node-authn-all-{stream},
csit-list: >
aaa-csit-1node-authn-only-{stream},
aaa-csit-1node-authn-all-{stream},
@@
-185,6
+188,7
@@
- stable-helium:
branch: 'stable/helium'
jdk: 'openjdk7'
- stable-helium:
branch: 'stable/helium'
jdk: 'openjdk7'
+ jre: 'openjdk7'
csit-list: >
aaa-csit-1node-imds-authn-only-{stream},
aaa-csit-1node-imds-authn-all-{stream},
csit-list: >
aaa-csit-1node-imds-authn-only-{stream},
aaa-csit-1node-imds-authn-all-{stream},
@@
-295,7
+299,9
@@
test-plan: 'test-libraries.txt'
- integration-patch-refspec:
branch: '$GERRIT_REFSPEC'
test-plan: 'test-libraries.txt'
- integration-patch-refspec:
branch: '$GERRIT_REFSPEC'
- # TODO: Use integration-jdk-version macro when switching to Boron
+ - integration-jdk-version:
+ jdkversion: 'openjdk7'
+ # TODO: Switch to openjdk8 from Boron on.
scm:
- integration-gerrit-scm:
scm:
- integration-gerrit-scm:
@@
-364,7
+370,7
@@
- integration-bundleurl:
bundleurl: 'last'
- integration-jdk-version:
- integration-bundleurl:
bundleurl: 'last'
- integration-jdk-version:
- jdkversion: '{j
dk
}'
+ jdkversion: '{j
re
}'
triggers:
- timed: 'H H * * 6'
triggers:
- timed: 'H H * * 6'
@@
-375,7
+381,6
@@
block: true
predefined-parameters:
BUNDLEURL=$BUNDLEURL
block: true
predefined-parameters:
BUNDLEURL=$BUNDLEURL
-
JDKVERSION=$JDKVERSION
publishers:
JDKVERSION=$JDKVERSION
publishers: