Skip to content

Commit 0543e12

Browse files
wirthiwirthi
committed
[GR-41756] Identify and add missing notify_emails for dailies and weeklies.
PullRequest: graal/12929
2 parents d36e5e4 + ccc09ba commit 0543e12

File tree

10 files changed

+79
-45
lines changed

10 files changed

+79
-45
lines changed

‎ci-check.libsonnet

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
local std_get = (import 'common-utils.libsonnet').std_get;
2+
3+
{
4+
# check that all non [gate, ondemand] entries have notify_emails or notify_groups defined
5+
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.member(x.targets, "daily") || std.member(x.targets, "weekly") || std.member(x.targets, "monthly"))
7+
},
8+
9+
verify_ci(builds)::
10+
local missingNotify = missing_notify(builds);
11+
assert std.length(missingNotify) == 0 : "Missing notify_emails or notify_groups: " + missingNotify;
12+
true
13+
,
14+
}

‎ci.jsonnet

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ local javadoc = import "ci_includes/publish-javadoc.jsonnet";
3535
# VM
3636
local vm = import 'vm/ci/ci_includes/vm.jsonnet';
3737

38+
local verify_ci = (import 'ci-check.libsonnet').verify_ci;
39+
3840
{
3941
# Ensure that entries in common.jsonnet can be resolved.
4042
_checkCommon: (import 'common.jsonnet'),
@@ -53,5 +55,6 @@ local vm = import 'vm/ci/ci_includes/vm.jsonnet';
5355
truffle.builds +
5456
javadoc.builds +
5557
vm.builds
56-
)]
58+
)],
59+
assert verify_ci(self.builds),
5760
}

‎common-utils.libsonnet

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,11 @@
8787
}
8888
else
8989
build,
90+
91+
# std.get is not available in all versions
92+
std_get(o, f, default=null, inc_hidden=true)::
93+
local objectHas = if inc_hidden then std.objectHasAll else std.objectHas;
94+
if objectHas(o, f) then o[f] else default
95+
,
96+
9097
}

‎graal-common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"README": "This file contains definitions that are useful for the jsonnet CI files of the graal and graal-enterprise repositories.",
33
"ci": {
4-
"overlay": "37341e5805b767cc5541f9fbe31815fb638de080"
4+
"overlay": "f85c347b45f2f0be8cc727285877dbf5c416d3b8"
55
}
66
}

‎tools/ci/ci.jsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
["mx", "sversions", "--print-repositories", "--json", "|", "coverage-uploader.py", "--associated-repos", "-"],
7979
],
8080
targets: ["weekly"],
81+
notify_groups:: ["tools"],
8182
},
8283

8384
builds: [
@@ -94,4 +95,4 @@
9495
common.darwin_amd64 + common.oraclejdk11 + tools_gate_lite,
9596
common.darwin_amd64 + common.oraclejdk17 + tools_gate_lite,
9697
],
97-
}
98+
}

‎truffle/ci/ci.jsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
["mx", "sversions", "--print-repositories", "--json", "|", "coverage-uploader.py", "--associated-repos", "-"],
159159
],
160160
targets: ["weekly"],
161+
notify_groups:: ["truffle"],
161162
},
162163

163164
# BENCHMARKS

‎vm/ci/ci_common/common-bench.jsonnet

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -234,23 +234,23 @@ local repo_config = import '../../../repo-configuration.libsonnet';
234234
vm_common.bench_ondemand_vm_linux_amd64 + self.vm_bench_js_linux_amd64('misc') + {name: 'ondemand-bench-vm-' + vm.vm_setup.short_name + '-js-misc-linux-amd64'},
235235
vm_common.bench_ondemand_vm_linux_amd64 + self.vm_bench_js_linux_amd64('npm-regex') + {name: 'ondemand-bench-vm-' + vm.vm_setup.short_name + '-js-npm-regex-linux-amd64'},
236236

237-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_interpreter + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-linux-amd64'},
238-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_compiler + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-compiler-linux-amd64'},
239-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_context_init + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-context-init-linux-amd64'},
240-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_warmup + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-warmup-linux-amd64'},
241-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_memory + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-memory-linux-amd64'},
237+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_interpreter + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-linux-amd64', notify_groups:: ['polybench']},
238+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_compiler + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-compiler-linux-amd64', notify_groups:: ['polybench']},
239+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_context_init + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-context-init-linux-amd64', notify_groups:: ['polybench']},
240+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_warmup + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-warmup-linux-amd64', notify_groups:: ['polybench']},
241+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_linux_memory + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-memory-linux-amd64', notify_groups:: ['polybench'] },
242242

243-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='native') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-default-native-linux-amd64'},
244-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='jvm') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-default-jvm-linux-amd64'},
245-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='native', suite='awfy:r[.*py]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-py-native-linux-amd64'},
246-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='jvm', suite='awfy:r[.*py]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-py-jvm-linux-amd64'},
247-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='native', suite='awfy:r[.*rb]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-rb-native-linux-amd64'},
248-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='jvm', suite='awfy:r[.*rb]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-rb-jvm-linux-amd64'},
249-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='native', suite='awfy:r[.*jar]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-jar-native-linux-amd64'},
250-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='jvm', suite='awfy:r[.*jar]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-jar-jvm-linux-amd64'},
243+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='native') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-default-native-linux-amd64', notify_groups:: ['polybench']},
244+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='jvm') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-default-jvm-linux-amd64', notify_groups:: ['polybench']},
245+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='native', suite='awfy:r[.*py]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-py-native-linux-amd64', notify_groups:: ['polybench']},
246+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='jvm', suite='awfy:r[.*py]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-py-jvm-linux-amd64', notify_groups:: ['polybench']},
247+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='native', suite='awfy:r[.*rb]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-rb-native-linux-amd64', notify_groups:: ['polybench']},
248+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='jvm', suite='awfy:r[.*rb]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-rb-jvm-linux-amd64', notify_groups:: ['polybench']},
249+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='native', suite='awfy:r[.*jar]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-jar-native-linux-amd64', notify_groups:: ['polybench']},
250+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(vm_config='jvm', suite='awfy:r[.*jar]') + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybenchmarks-awfy-jar-jvm-linux-amd64', notify_groups:: ['polybench']},
251251

252-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_nfi_linux_amd64 + vm.vm_java_11 + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-nfi-java11-linux-amd64'},
253-
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_nfi_linux_amd64 + vm.vm_java_17 + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-nfi-java17-linux-amd64'},
252+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_nfi_linux_amd64 + vm.vm_java_11 + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-nfi-java11-linux-amd64', notify_groups:: ['polybench']},
253+
vm_common.bench_daily_vm_linux_amd64 + self.vm_bench_polybench_nfi_linux_amd64 + vm.vm_java_17 + {name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-polybench-nfi-java17-linux-amd64', notify_groups:: ['polybench']},
254254

255255
vm_common.bench_daily_vm_linux_amd64 + self.x52_js_bench_compilation_throughput(true) + vm.vm_java_11 + { name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-libgraal-pgo-throughput-js-typescript-java11-linux-amd64' },
256256
vm_common.bench_daily_vm_linux_amd64 + self.x52_js_bench_compilation_throughput(true) + vm.vm_java_17 + { name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-libgraal-pgo-throughput-js-typescript-java17-linux-amd64' },
@@ -267,6 +267,7 @@ local repo_config = import '../../../repo-configuration.libsonnet';
267267
],
268268
timelimit: '45:00',
269269
name: 'daily-bench-vm-' + vm.vm_setup.short_name + '-agentscript-js-java17-linux-amd64',
270+
notify_groups:: ['javascript'],
270271
},
271272

272273
vm_common.gate_vm_linux_amd64 + self.vm_bench_polybenchmarks_linux_common(is_gate=true) + {name: 'gate-vm-' + vm.vm_setup.short_name + '-polybenchmarks-linux-amd64'},

0 commit comments

Comments
 (0)