Skip to content

Commit 7b30fb2

Browse files
committed
[GR-18019] Add test gates with JDK11
1 parent ccde7cb commit 7b30fb2

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

ci.jsonnet

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ local builder = import 'ci_common/builder.libsonnet';
2020
//
2121
// ------------------------------------------------------------------------------------------------------
2222
local gates = [
23-
// unittests
23+
// unittests on JDK8
2424
builder.testGate(type="unittest", platform="linux"),
2525
builder.testGate(type="unittest", platform="darwin"),
2626
builder.testGateTime(type="tagged-unittest", platform="linux", timelimit=const.TIME_LIMIT["2h"]),
@@ -29,6 +29,10 @@ local builder = import 'ci_common/builder.libsonnet';
2929
builder.testGate(type="svm-unittest", platform="darwin"),
3030
builder.testGate(type="unittest-jython", platform="linux"),
3131

32+
// JDK11
33+
builder.testGate11(type="unittest", platform="linux"),
34+
builder.testGate11(type="svm-unittest", platform="linux"),
35+
3236
// junit
3337
builder.testGate(type="junit", platform="linux"),
3438
builder.testGate(type="junit", platform="darwin"),

ci_common/builder.libsonnet

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,15 @@ local mixins = import 'mixins.libsonnet';
6060
baseGraalGate:: baseGraalGate,
6161

6262
// specific gates
63-
testGate(type, platform)::
63+
local testGate = function(type, platform)
6464
baseGraalGate + {tags:: "python-"+type} + mixins.getPlatform(platform) + {name: "python-"+ type +"-"+platform},
65+
testGate:: testGate,
66+
67+
testGate11(type, platform)::
68+
testGate(type, platform) + mixins.labsjdk11 + {name: "python-"+ type +"-jdk11-"+platform},
6569

6670
testGateTime(type, platform, timelimit)::
67-
baseGraalGate + {tags:: "python-"+type} + mixins.getPlatform(platform) + {name: "python-"+ type +"-"+platform} + {timelimit: timelimit},
71+
testGate(type, platform) + {timelimit: timelimit},
6872

6973
local baseStyleGate = baseGraalGate + mixins.eclipse + mixins.linux + {
7074
tags:: "style",

ci_common/mixins.libsonnet

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,28 @@ local const = import 'constants.libsonnet';
7272
},
7373
eclipse:: eclipse,
7474

75-
local labsjdk8 = {
76-
downloads +: {
77-
JAVA_HOME: utils.download("oraclejdk", "8u212-jvmci-19.2-b01"),
78-
},
75+
local labsjdk = {
7976
environment +: {
8077
CI: "true",
8178
GRAALVM_CHECK_EXPERIMENTAL_OPTIONS: "true",
8279
PATH: "$JAVA_HOME/bin:$PATH",
8380
},
8481
},
82+
83+
local labsjdk8 = labsjdk + {
84+
downloads +: {
85+
JAVA_HOME: utils.download("oraclejdk", "8u221-jvmci-19.3-b01"),
86+
},
87+
},
8588
labsjdk8:: labsjdk8,
8689

90+
local labsjdk11 = labsjdk + {
91+
downloads +: {
92+
JAVA_HOME: utils.download("oraclejdk", "11.0.3+12"),
93+
},
94+
},
95+
labsjdk11:: labsjdk11,
96+
8797
local graal = labsjdk8 + {
8898
environment +: {
8999
HOST_VM: const.JVM.server,

0 commit comments

Comments
 (0)