Skip to content

Commit 1d7170b

Browse files
committed
[GR-66842] Support for tiered CI in substratevm
PullRequest: graal/21318
2 parents a0316f8 + 6a75044 commit 1d7170b

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.57.1",
7+
"mx_version": "7.58.1",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

substratevm/ci/ci.jsonnet

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
local spotbugs = task_spec(common.deps.spotbugs),
2323
local jdt = task_spec(common.deps.jdt),
2424
local gate = sg.gate,
25+
local tier1 = sg.tier1,
26+
local tier2 = sg.tier2,
27+
local tier3 = sg.tier3,
2528
local gdb(version) = task_spec(sg.gdb(version)),
2629
local use_musl_static = sg.use_musl_static,
2730
local use_musl_dynamic = sg.use_musl_dynamic,

substratevm/ci/ci_common/svm-gate.libsonnet

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
for f in _fields
4444
],
4545
mxgate_name:: outer.task_name,
46-
name: std.join("-", [outer.target, suite_short, self.mxgate_name] + config + [outer.jdk_name] + target_arch_suffix + [outer.os, outer.arch]) + batch_suffix,
46+
# we use the "gate-" prefix also for tiered jobs to avoid changing existing job names
47+
local name_prefix = if std.startsWith(outer.target, "tier") then "gate" else outer.target,
48+
name: std.join("-", [name_prefix, suite_short, self.mxgate_name] + config + [outer.jdk_name] + target_arch_suffix + [outer.os, outer.arch]) + batch_suffix,
4749
run+: [["mx", "--kill-with-sigquit", "--strict-compliance"] + dynamic_imports + ["gate", "--strict-mode", "--tags", std.join(",", outer.mxgate_tags)] + outer.mxgate_extra_args],
4850
}
4951
})),
@@ -67,6 +69,9 @@
6769
}),
6870

6971
gate:: $.target("gate"),
72+
tier1:: $.target("tier1"),
73+
tier2:: $.target("tier2"),
74+
tier3:: $.target("tier3"),
7075
daily:: $.target("daily"),
7176
weekly:: $.target("weekly"),
7277
ondemand:: $.target("ondemand"),

substratevm/mx.substratevm/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pylint: disable=line-too-long
22
suite = {
3-
"mxversion": "7.55.7",
3+
"mxversion": "7.58.1",
44
"name": "substratevm",
55
"version" : "26.0.0",
66
"release" : False,

0 commit comments

Comments
 (0)