Skip to content

Commit 2899714

Browse files
timfeltimfel
committed
Assign tiers to CI jobs
1 parent 740cb40 commit 2899714

File tree

3 files changed

+104
-72
lines changed

3 files changed

+104
-72
lines changed

‎ci.jsonnet‎

Lines changed: 70 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(import "ci/python-bench.libsonnet") +
77
{
88
overlay: "a8df46e16d6fcae69e9a7c42c632131fdf6e043e",
9-
specVersion: "3",
9+
specVersion: "6",
1010
// Until buildbot issues around CI tiers are resolved, we cannot use them
1111
// tierConfig: self.tierConfig,
1212

@@ -137,16 +137,19 @@
137137
// gates
138138
// -----------------------------------------------------------------------------------------------------------------
139139
local gate_task_dict = {
140+
"build": gpgate + platform_spec(no_jobs) + platform_spec({
141+
"linux:amd64:jdk-latest" : tier1 + provide(GPY_JVM_STANDALONE),
142+
}),
140143
"python-unittest": gpgate + platform_spec(no_jobs) + platform_spec({
141144
"linux:amd64:jdk21" : daily + t("01:00:00") + provide(GPY_JVM21_STANDALONE),
142145
"linux:aarch64:jdk21" : daily + t("02:00:00") + provide(GPY_JVM21_STANDALONE),
143146
"darwin:aarch64:jdk21" : daily + t("01:00:00") + provide(GPY_JVM21_STANDALONE),
144147
"windows:amd64:jdk21" : daily + t("01:30:00") + provide(GPY_JVM21_STANDALONE),
145-
"linux:amd64:jdk-latest" : tier1 + t("01:00:00") + provide(GPY_JVM_STANDALONE),
146-
"linux:aarch64:jdk-latest" : tier2 + t("01:30:00") + provide(GPY_JVM_STANDALONE),
148+
"linux:amd64:jdk-latest" : tier2 + require(GPY_JVM_STANDALONE),
149+
"linux:aarch64:jdk-latest" : tier3 + provide(GPY_JVM_STANDALONE),
147150
"darwin:amd64:jdk-latest" : daily + t("01:30:00") + daily + provide(GPY_JVM_STANDALONE),
148-
"darwin:aarch64:jdk-latest" : tier3 + t("01:00:00") + provide(GPY_JVM_STANDALONE),
149-
"windows:amd64:jdk-latest" : tier3 + t("01:30:00") + provide(GPY_JVM_STANDALONE),
151+
"darwin:aarch64:jdk-latest" : tier3 + provide(GPY_JVM_STANDALONE),
152+
"windows:amd64:jdk-latest" : tier3 + provide(GPY_JVM_STANDALONE),
150153
}),
151154
"python-unittest-bytecode-dsl": gpgate + platform_spec(no_jobs) + bytecode_dsl_gate("python-unittest") + platform_spec({
152155
"linux:amd64:jdk21" : daily + t("01:00:00"),
@@ -158,7 +161,7 @@
158161
"linux:aarch64:jdk21" : daily + t("01:30:00") + require(GPY_JVM21_STANDALONE),
159162
"darwin:aarch64:jdk21" : daily + t("01:00:00") + require(GPY_JVM21_STANDALONE),
160163
"windows:amd64:jdk21" : daily + t("02:00:00"),
161-
"linux:amd64:jdk-latest" : tier2 + t("01:00:00") + require(GPY_JVM_STANDALONE),
164+
"linux:amd64:jdk-latest" : tier2 + require(GPY_JVM_STANDALONE),
162165
"linux:aarch64:jdk-latest" : daily + t("01:30:00") + require(GPY_JVM_STANDALONE),
163166
"darwin:amd64:jdk-latest" : daily + t("01:00:00") + require(GPY_JVM_STANDALONE),
164167
"darwin:aarch64:jdk-latest" : daily + t("01:00:00") + require(GPY_JVM_STANDALONE),
@@ -168,44 +171,44 @@
168171
"linux:amd64:jdk21" : daily + t("00:30:00") + require(GPY_JVM21_STANDALONE),
169172
"linux:aarch64:jdk21" : daily + t("00:30:00") + require(GPY_JVM21_STANDALONE),
170173
"darwin:aarch64:jdk21" : daily + t("00:30:00") + require(GPY_JVM21_STANDALONE),
171-
"linux:amd64:jdk-latest" : tier2 + t("00:30:00") + require(GPY_JVM_STANDALONE),
174+
"linux:amd64:jdk-latest" : tier2 + require(GPY_JVM_STANDALONE),
172175
"linux:aarch64:jdk-latest" : daily + t("00:30:00") + require(GPY_JVM_STANDALONE),
173176
"darwin:amd64:jdk-latest" : daily + t("00:30:00") + require(GPY_JVM_STANDALONE),
174177
"darwin:aarch64:jdk-latest" : daily + t("00:30:00") + require(GPY_JVM_STANDALONE),
175178
}),
176179
"python-unittest-hpy": gpgate + require(GPY_NATIVE_STANDALONE) + platform_spec(no_jobs) + platform_spec({
177-
"linux:amd64:jdk-latest" : tier2 + t("02:00:00"),
180+
"linux:amd64:jdk-latest" : tier3,
178181
}),
179-
"python-unittest-arrow-storage": gpgate + platform_spec(no_jobs) + platform_spec({
180-
"linux:amd64:jdk-latest" : tier2 + t("01:00:00"),
182+
"python-unittest-arrow-storage": gpgate + require(GPY_JVM_STANDALONE) + platform_spec(no_jobs) + platform_spec({
183+
"linux:amd64:jdk-latest" : tier2,
181184
}),
182185
"python-unittest-posix": gpgate + platform_spec(no_jobs) + platform_spec({
183-
"linux:amd64:jdk-latest" : tier1 + t("00:30:00") + require(GPY_JVM_STANDALONE),
184-
"linux:aarch64:jdk-latest" : tier2 + t("00:30:00") + require(GPY_JVM_STANDALONE),
186+
"linux:amd64:jdk-latest" : tier1 + require(GPY_JVM_STANDALONE),
187+
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
185188
"darwin:amd64:jdk-latest" : daily + t("01:30:00") + require(GPY_JVM_STANDALONE),
186-
"darwin:aarch64:jdk-latest" : tier3 + t("01:30:00") + require(GPY_JVM_STANDALONE),
189+
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
187190
}),
188191
"python-unittest-standalone": gpgate_maven + platform_spec(no_jobs) + platform_spec({
189192
"linux:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
190193
"linux:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
191194
"darwin:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
192195
"darwin:amd64:jdk-latest" : daily + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
193196
"windows:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE) + batches(2),
194-
"linux:amd64:jdk-latest" : tier2 + t("01:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
195-
"linux:aarch64:jdk-latest" : tier3 + t("01:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
196-
"darwin:aarch64:jdk-latest" : tier3 + t("01:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
197-
"windows:amd64:jdk-latest" : tier3 + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
197+
"linux:amd64:jdk-latest" : tier2 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
198+
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
199+
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
200+
"windows:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
198201
}),
199202
"python-unittest-gradle-plugin": gpgate + platform_spec(no_jobs) + platform_spec({
200203
"linux:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
201204
"linux:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
202205
"darwin:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
203206
"darwin:amd64:jdk-latest" : daily + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
204207
"windows:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE) + batches(2),
205-
"linux:amd64:jdk-latest" : tier1 + t("01:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
206-
"linux:aarch64:jdk-latest" : tier3 + t("01:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
207-
"darwin:aarch64:jdk-latest" : tier3 + t("01:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
208-
"windows:amd64:jdk-latest" : tier3 + t("02:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
208+
"linux:amd64:jdk-latest" : tier1 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
209+
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
210+
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
211+
"windows:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
209212
}),
210213
"python-unittest-gradle-plugin-long-run": gpgate + platform_spec(no_jobs) + platform_spec({
211214
"linux:amd64:jdk-latest" : post_merge + t("02:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
@@ -219,15 +222,15 @@
219222
"darwin:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
220223
"darwin:amd64:jdk-latest" : daily + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
221224
"windows:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE) + batches(2),
222-
"linux:amd64:jdk-latest" : tier1 + t("01:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
223-
"linux:aarch64:jdk-latest" : tier3 + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
224-
"darwin:aarch64:jdk-latest" : tier3 + t("01:30:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
225-
"windows:amd64:jdk-latest" : tier3 + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
225+
"linux:amd64:jdk-latest" : tier1 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
226+
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
227+
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
228+
"windows:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
226229
}),
227230
"python-junit-vfsutils": gpgate + platform_spec(no_jobs) + platform_spec({
228-
"linux:amd64:jdk-latest" : tier1 + t("02:30:00") + require(GPY_JVM_STANDALONE),
229-
"linux:aarch64:jdk-latest" : tier3 + t("02:30:00") + require(GPY_JVM_STANDALONE),
230-
"darwin:aarch64:jdk-latest" : tier3 + t("02:30:00") + require(GPY_JVM_STANDALONE),
231+
"linux:amd64:jdk-latest" : tier1 + require(GPY_JVM_STANDALONE),
232+
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
233+
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
231234
"windows:amd64:jdk-latest" : post_merge + t("03:59:00") + require(GPY_JVM_STANDALONE),
232235
}),
233236
"python-unittest-maven-plugin-long-run": gpgate_maven + platform_spec(no_jobs) + platform_spec({
@@ -241,61 +244,61 @@
241244
"linux:aarch64:jdk21" : daily + t("01:30:00"),
242245
"darwin:aarch64:jdk21" : daily + t("01:30:00"),
243246
"windows:amd64:jdk21" : daily + t("01:00:00"),
244-
"linux:amd64:jdk-latest" : tier1 + t("01:00:00"),
245-
"linux:aarch64:jdk-latest" : tier3 + t("01:00:00"),
247+
"linux:amd64:jdk-latest" : tier1,
248+
"linux:aarch64:jdk-latest" : tier3,
246249
"darwin:amd64:jdk-latest" : daily + t("01:30:00"),
247-
"darwin:aarch64:jdk-latest" : tier3 + t("01:30:00"),
248-
"windows:amd64:jdk-latest" : tier3 + t("01:00:00"),
250+
"darwin:aarch64:jdk-latest" : tier3,
251+
"windows:amd64:jdk-latest" : tier3,
249252
}),
250253
"python-junit-bytecode-dsl": gpgate + platform_spec(no_jobs) + bytecode_dsl_gate("python-junit") + platform_spec({
251-
"linux:amd64:jdk21" : tier2 + t("01:00:00"),
254+
"linux:amd64:jdk21" : tier2,
252255
}),
253256
"python-junit-maven": gpgate_maven + platform_spec(no_jobs) + platform_spec({
254257
"linux:amd64:jdk21" : daily + t("00:30:00"),
255258
"linux:aarch64:jdk21" : daily + t("01:00:00"),
256259
"darwin:aarch64:jdk21" : daily + t("01:30:00"),
257260
"windows:amd64:jdk21" : daily + t("01:30:00"),
258-
"linux:amd64:jdk-latest" : tier1 + t("00:30:00") + provide(GRAAL_JDK_LATEST),
259-
"linux:aarch64:jdk-latest" : tier3 + t("01:00:00") + provide(GRAAL_JDK_LATEST),
261+
"linux:amd64:jdk-latest" : tier1 + provide(GRAAL_JDK_LATEST),
262+
"linux:aarch64:jdk-latest" : tier3 + provide(GRAAL_JDK_LATEST),
260263
"darwin:amd64:jdk-latest" : daily + t("01:30:00") + provide(GRAAL_JDK_LATEST),
261-
"darwin:aarch64:jdk-latest" : tier3 + t("01:30:00") + provide(GRAAL_JDK_LATEST),
262-
"windows:amd64:jdk-latest" : tier3 + t("01:30:00") + provide(GRAAL_JDK_LATEST),
264+
"darwin:aarch64:jdk-latest" : tier3 + provide(GRAAL_JDK_LATEST),
265+
"windows:amd64:jdk-latest" : tier3 + provide(GRAAL_JDK_LATEST),
263266
}),
264267
"python-junit-polyglot-isolates": gpgate_ee + platform_spec(no_jobs) + platform_spec({
265-
"linux:amd64:jdk-latest" : tier1 + t("01:00:00"),
266-
"linux:aarch64:jdk-latest" : tier3 + t("01:00:00"),
267-
"darwin:aarch64:jdk-latest" : tier3 + t("01:00:00"),
268-
"windows:amd64:jdk-latest" : tier3 + t("01:00:00"),
268+
"linux:amd64:jdk-latest" : tier1,
269+
"linux:aarch64:jdk-latest" : tier3,
270+
"darwin:aarch64:jdk-latest" : tier3,
271+
"windows:amd64:jdk-latest" : tier3,
269272
}),
270273
"python-svm-unittest": gpgate + platform_spec(no_jobs) + platform_spec({
271-
"linux:amd64:jdk-latest" : tier1 + t("01:30:00") + provide(GPY_NATIVE_STANDALONE),
272-
"linux:aarch64:jdk-latest" : tier2 + t("01:30:00") + provide(GPY_NATIVE_STANDALONE),
274+
"linux:amd64:jdk-latest" : tier1 + provide(GPY_NATIVE_STANDALONE),
275+
"linux:aarch64:jdk-latest" : tier3 + provide(GPY_NATIVE_STANDALONE),
273276
"darwin:amd64:jdk-latest" : daily + t("01:30:00") + provide(GPY_NATIVE_STANDALONE),
274-
"darwin:aarch64:jdk-latest" : tier3 + t("01:30:00") + provide(GPY_NATIVE_STANDALONE),
275-
"windows:amd64:jdk-latest" : tier3 + t("01:30:00") + provide(GPY_NATIVE_STANDALONE),
277+
"darwin:aarch64:jdk-latest" : tier3 + provide(GPY_NATIVE_STANDALONE),
278+
"windows:amd64:jdk-latest" : tier3 + provide(GPY_NATIVE_STANDALONE),
276279
}),
277280
"python-svm-unittest-bytecode-dsl": gpgate + platform_spec(no_jobs) + bytecode_dsl_gate("python-svm-unittest") + platform_spec({
278-
"linux:amd64:jdk-latest" : tier2 + t("01:30:00") + provide(GPY_NATIVE_BYTECODE_DSL_STANDALONE),
281+
"linux:amd64:jdk-latest" : tier2 + provide(GPY_NATIVE_BYTECODE_DSL_STANDALONE),
279282
}),
280283
"python-tagged-unittest": gpgate + require(GPY_NATIVE_STANDALONE) + batches(TAGGED_UNITTESTS_SPLIT) + platform_spec(no_jobs) + platform_spec({
281-
"linux:amd64:jdk-latest" : tier2 + t("02:00:00"),
282-
"linux:aarch64:jdk-latest" : tier3 + t("02:00:00"),
284+
"linux:amd64:jdk-latest" : tier2,
285+
"linux:aarch64:jdk-latest" : tier3,
283286
"darwin:amd64:jdk-latest" : daily + t("02:00:00"),
284-
"darwin:aarch64:jdk-latest" : tier3 + t("02:00:00"),
287+
"darwin:aarch64:jdk-latest" : tier3,
285288
"windows:amd64:jdk-latest" : daily + t("02:00:00"),
286289
}),
287290
"python-tagged-unittest-bytecode-dsl": gpgate + require(GPY_NATIVE_BYTECODE_DSL_STANDALONE) + batches(TAGGED_UNITTESTS_SPLIT) + bytecode_dsl_gate("python-tagged-unittest") + platform_spec(no_jobs) + platform_spec({
288-
"linux:amd64:jdk-latest" : tier3 + t("02:00:00"),
291+
"linux:amd64:jdk-latest" : tier3,
289292
}),
290293
"python-graalvm": gpgate + platform_spec(no_jobs) + platform_spec({
291-
"linux:amd64:jdk-latest" : tier2 + t("01:00:00"),
292-
"linux:aarch64:jdk-latest" : tier3 + t("01:00:00"),
294+
"linux:amd64:jdk-latest" : tier2,
295+
"linux:aarch64:jdk-latest" : tier3,
293296
"darwin:amd64:jdk-latest" : daily + t("01:00:00") + daily,
294-
"darwin:aarch64:jdk-latest" : tier3 + t("01:00:00"),
295-
"windows:amd64:jdk-latest" : tier3 + t("01:00:00"),
297+
"darwin:aarch64:jdk-latest" : tier3,
298+
"windows:amd64:jdk-latest" : tier3,
296299
}),
297300
"python-unittest-cpython": cpygate + platform_spec(no_jobs) + platform_spec({
298-
"linux:amd64:jdk-latest" : tier1 + t("00:30:00"),
301+
"linux:amd64:jdk-latest" : tier1,
299302
}),
300303
"python-unittest-retagger": ut_retagger + platform_spec(no_jobs) + platform_spec({
301304
"linux:amd64:jdk-latest" : weekly + t("20:00:00"),
@@ -318,7 +321,7 @@
318321
"linux:amd64:jdk21" : weekly + t("20:00:00"),
319322
}),
320323
"corp-compliance-watchdog": watchdog + platform_spec(no_jobs) + platform_spec({
321-
"linux:amd64:jdk-latest" : tier1 + t("00:30:00"),
324+
"linux:amd64:jdk-latest" : tier1,
322325
}),
323326
"bisect-benchmark": bisect_bench_task + platform_spec(no_jobs) + platform_spec({
324327
# Compiler and SVM no longer support building with anything but the
@@ -328,17 +331,17 @@
328331
"linux:amd64:jdk-latest" : on_demand + t("20:00:00"),
329332
}),
330333
"style": style_gate + platform_spec(no_jobs) + platform_spec({
331-
"linux:amd64:jdk-latest" : tier1 + t("01:00:00"),
334+
"linux:amd64:jdk-latest" : tier1,
332335
}),
333336
// tests with sandboxed backends for various modules (posix, sha3, ctypes, ...)
334337
"python-unittest-sandboxed": gpgate_ee + platform_spec(no_jobs) + platform_spec({
335-
"linux:amd64:jdk-latest" : tier2 + t("01:00:00"),
338+
"linux:amd64:jdk-latest" : tier2,
336339
}),
337340
"python-svm-unittest-sandboxed": gpgate_ee + provide(GPYEE_NATIVE_STANDALONE) + platform_spec(no_jobs) + platform_spec({
338-
"linux:amd64:jdk-latest" : tier3 + t("02:00:00"),
341+
"linux:amd64:jdk-latest" : tier3,
339342
}),
340343
"tox-example": gpgate_ee + require(GPYEE_NATIVE_STANDALONE) + platform_spec(no_jobs) + platform_spec({
341-
"linux:amd64:jdk-latest" : tier3 + t("01:00:00"),
344+
"linux:amd64:jdk-latest" : tier3,
342345
}),
343346
"build-wheels": base_gate + platform_spec(no_jobs) + platform_spec({
344347
"windows:amd64:jdk-latest" : on_demand + t("01:00:00"),
@@ -519,9 +522,13 @@
519522
processed_gate_builds::run_spec.process(gate_task_dict),
520523
processed_bench_builds::run_spec.process(bench_task_dict),
521524

522-
builds: utils.ensure_no_mx_wrong_build(utils.with_notify_groups([
523-
{'defined_in': std.thisFile} + b for b in self.processed_gate_builds.list + self.processed_bench_builds.list
524-
])) + [
525+
builds: utils.ensure_no_mx_wrong_build(
526+
utils.ensure_tier_time_and_machine_limits(
527+
utils.with_notify_groups([
528+
{'defined_in': std.thisFile} + b for b in self.processed_gate_builds.list + self.processed_bench_builds.list
529+
])
530+
)
531+
) + [
525532
{
526533
name: "graalpy-website-build",
527534
targets: ["gate"],

0 commit comments

Comments
 (0)