Skip to content

Commit b887c36

Browse files
committed
[GR-67642] Move wasm and regex gates to tiers.
PullRequest: graal/21551
2 parents d031227 + e03a15c commit b887c36

File tree

5 files changed

+52
-17
lines changed

5 files changed

+52
-17
lines changed

ci/ci_common/ci-check.libsonnet

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
local ci = import '../../ci.jsonnet';
12
local std_get = (import 'common-utils.libsonnet').std_get;
23

34
{
5+
local effective_targets(build) = std.map(function(target) if std.startsWith(target, "tier") then ci.tierConfig[target] else target, build.targets),
6+
local periodic_targets = ["daily", "weekly", "monthly", "post-merge", "opt-post-merge"],
7+
local has_periodic_target(build) = std.length(std.setInter(std.set(effective_targets(build)), std.set(periodic_targets))) != 0,
8+
49
# check that all non [gate, ondemand] entries have notify_emails or notify_groups defined
510
local missing_notify(builds) = {
6-
[x.name]: std_get(x, "defined_in") for x in builds if !std.objectHas(x, "notify_emails") && !std.objectHasAll(x, "notify_groups") && std.length(std.setInter(std.set(x.targets), std.set(["daily", "weekly", "monthly", "post-merge", "opt-post-merge"]))) != 0
11+
[x.name]: {defined_in: std_get(x, "defined_in"), targets: std_get(x, "targets")}
12+
for x in builds if !std.objectHas(x, "notify_emails") && !std.objectHasAll(x, "notify_groups") && has_periodic_target(x)
713
},
814

9-
# check that all non entries have defined_in set
15+
# check that all entries have defined_in set
1016
local missing_defined_in(builds) = {
1117
[x.name]: std_get(x, "defined_in") for x in builds if !std.objectHas(x, "defined_in")
1218
},

ci/ci_common/run-spec-impl.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;
9595
else
9696
// exclusion
9797
assert std.length(excluded) == std.length(_values) : "Cannot mix inclusion with exclusion (either all entries start with '!' or none): " + _values;
98-
std.setDiff(std.objectFieldsAll(feature_map[self.feature]), excluded)
98+
std.setDiff(std.set(std.objectFieldsAll(feature_map[self.feature])), std.set(excluded))
9999
}
100100
;
101101
local is_feature_desc(key) = std.member(feature_order, get_feature_value_pair(key).feature);

regex/ci/ci.jsonnet

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@
1313
local regex_gate = regex_common + common.deps.eclipse + common.deps.jdt + common.deps.spotbugs + {
1414
name: 'gate-regex-' + self.jdk_name,
1515
run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
16-
targets: ["gate"],
1716
},
1817

19-
local regex_gate_lite = regex_common + galahad.exclude {
18+
local regex_gate_lite = regex_common + galahad.exclude + {
2019
name: 'weekly-regex-mac-lite-' + self.jdk_name,
2120
run: [
2221
["mx", "build"],
2322
["mx", "unittest", "--verbose", "com.oracle.truffle.regex"],
2423
],
2524
notify_groups:: ["regex"],
26-
targets: ["weekly"],
2725
},
2826

2927
local regex_downstream_js = regex_common + {
@@ -38,7 +36,6 @@
3836
["mx", "sversions"],
3937
["mx", "gate", "--no-warning-as-error", "--all-suites", "--tags", "build,Test262-default,TestV8-default,regex"],
4038
],
41-
targets: ["gate"],
4239
},
4340

4441
local regex_coverage = regex_common + {
@@ -56,9 +53,9 @@
5653

5754
local _builds = [utils.add_gate_predicate(b, ["sdk", "truffle", "regex", "compiler", "vm", "substratevm"]) for b in std.flattenArrays([
5855
[
59-
common.linux_amd64 + jdk + regex_gate,
60-
common.linux_amd64 + jdk + regex_downstream_js,
61-
common.darwin_aarch64 + jdk + regex_gate_lite,
56+
common.linux_amd64 + jdk + common.tier1 + regex_gate,
57+
common.linux_amd64 + jdk + common.tier3 + regex_downstream_js,
58+
common.darwin_aarch64 + jdk + common.weekly + regex_gate_lite,
6259
] for jdk in [
6360
common.labsjdkLatest,
6461
]

wasm/ci/ci.jsonnet

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ jdks + wasm_common +
2121

2222
local _builds = [
2323
# Gates.
24-
$.jdkLatest + $.linux_amd64 + $.gate + $.gate_graalwasm_style + tools_java_home + {name: 'gate-graalwasm-style-fullbuild' + self.name_suffix},
24+
$.jdkLatest + $.linux_amd64 + $.tier1 + $.gate_graalwasm_style + tools_java_home + {name: 'gate-graalwasm-style-fullbuild' + self.name_suffix},
25+
26+
$.jdkLatest + $.linux_amd64 + $.tier2 + $.gate_graalwasm_full + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest' + self.name_suffix},
2527
] + [
26-
$.jdkLatest + platform + $.gate + $.gate_graalwasm_full + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest' + self.name_suffix}
27-
for platform in [$.linux_amd64, $.linux_aarch64, $.windows_amd64, $.darwin_aarch64]
28+
$.jdkLatest + platform + $.tier3 + $.gate_graalwasm_full + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest' + self.name_suffix}
29+
for platform in [$.linux_aarch64, $.windows_amd64, $.darwin_aarch64]
2830
] + [
29-
$.jdkLatest + $.linux_amd64 + $.gate + $.gate_graalwasm_emsdk_full + {environment+: {GATE_TAGS: 'buildall,wasmextratest'}} + {name: 'gate-graalwasm-extra-unittest' + self.name_suffix},
30-
$.jdkLatest + $.linux_amd64 + $.gate + $.gate_graalwasm_emsdk_full + {environment+: {GATE_TAGS: 'buildall,wasmbenchtest'}} + {name: 'gate-graalwasm-benchtest' + self.name_suffix},
31+
$.jdkLatest + $.linux_amd64 + $.tier2 + $.gate_graalwasm_emsdk_full + {environment+: {GATE_TAGS: 'buildall,wasmextratest'}} + {name: 'gate-graalwasm-extra-unittest' + self.name_suffix},
32+
$.jdkLatest + $.linux_amd64 + $.tier2 + $.gate_graalwasm_emsdk_full + {environment+: {GATE_TAGS: 'buildall,wasmbenchtest'}} + {name: 'gate-graalwasm-benchtest' + self.name_suffix},
3133

3234
$.jdkLatest + $.linux_amd64 + $.weekly + $.gate_graalwasm_coverage + tools_java_home + {name: 'weekly-graalwasm-coverage' + self.name_suffix},
3335

wasm/ci/ci_common/common.jsonnet

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,23 @@ local graal_suite_root = root_ci.graal_suite_root;
99

1010
devkits:: common.devkits,
1111

12-
gate:: {
13-
targets+: ['gate'],
12+
tier1:: {
13+
targets+: ['tier1'],
14+
},
15+
tier2:: {
16+
targets+: ['tier2'],
17+
},
18+
tier3:: {
19+
targets+: ['tier3'],
20+
},
21+
tier4:: {
22+
targets+: ['tier4'],
23+
notify_groups:: ['wasm'],
24+
},
25+
26+
postmerge:: {
27+
targets+: ['post-merge'],
28+
notify_groups:: ['wasm'],
1429
},
1530

1631
daily:: {
@@ -23,12 +38,27 @@ local graal_suite_root = root_ci.graal_suite_root;
2338
notify_groups:: ['wasm'],
2439
},
2540

41+
monthly:: {
42+
targets+: ['monthly'],
43+
notify_groups:: ['wasm'],
44+
},
45+
46+
ondemand:: {
47+
targets+: ['ondemand'],
48+
},
49+
50+
deploy:: {
51+
targets+: ['deploy'],
52+
},
53+
2654
bench:: {
2755
targets+: ['bench'],
2856
},
2957

3058
bench_daily:: self.bench + self.daily,
3159
bench_weekly:: self.bench + self.weekly,
60+
bench_monthly:: self.bench + self.monthly,
61+
bench_ondemand:: self.bench + self.ondemand,
3262

3363
linux_common:: {
3464
packages+: {

0 commit comments

Comments
 (0)