Skip to content

Commit 2921d30

Browse files
committed
Better pipelining resource usage
1 parent fdd92d4 commit 2921d30

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

ci.jsonnet

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
// gates
138138
// -----------------------------------------------------------------------------------------------------------------
139139
local gate_task_dict = {
140-
"python-jvm-build": gpgate + platform_spec(no_jobs) + platform_spec({
140+
"build": gpgate + platform_spec(no_jobs) + platform_spec({
141141
"linux:amd64:jdk-latest" : tier1 + provide(GPY_JVM_STANDALONE),
142142
}),
143143
"python-unittest": gpgate + platform_spec(no_jobs) + platform_spec({
@@ -194,7 +194,7 @@
194194
"darwin:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
195195
"darwin:amd64:jdk-latest" : daily + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
196196
"windows:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE) + batches(2),
197-
"linux:amd64:jdk-latest" : tier2 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
197+
"linux:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
198198
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
199199
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
200200
"windows:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
@@ -244,14 +244,14 @@
244244
"linux:aarch64:jdk21" : daily + t("01:30:00"),
245245
"darwin:aarch64:jdk21" : daily + t("01:30:00"),
246246
"windows:amd64:jdk21" : daily + t("01:00:00"),
247-
"linux:amd64:jdk-latest" : tier2,
248-
"linux:aarch64:jdk-latest" : tier3,
247+
"linux:amd64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST),
248+
"linux:aarch64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST),
249249
"darwin:amd64:jdk-latest" : daily + t("01:30:00"),
250-
"darwin:aarch64:jdk-latest" : tier3,
251-
"windows:amd64:jdk-latest" : tier3,
250+
"darwin:aarch64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST),
251+
"windows:amd64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST),
252252
}),
253253
"python-junit-bytecode-dsl": gpgate + platform_spec(no_jobs) + bytecode_dsl_gate("python-junit") + platform_spec({
254-
"linux:amd64:jdk21" : tier2,
254+
"linux:amd64:jdk21" : tier3 + require(GRAAL_JDK_LATEST),
255255
}),
256256
"python-junit-maven": gpgate_maven + platform_spec(no_jobs) + platform_spec({
257257
"linux:amd64:jdk21" : daily + t("00:30:00"),
@@ -294,11 +294,11 @@
294294
"linux:amd64:jdk-latest" : tier3,
295295
}),
296296
"python-graalvm": gpgate + platform_spec(no_jobs) + platform_spec({
297-
"linux:amd64:jdk-latest" : tier2,
298-
"linux:aarch64:jdk-latest" : tier3,
297+
"linux:amd64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST),
298+
"linux:aarch64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST),
299299
"darwin:amd64:jdk-latest" : daily + t("01:00:00") + daily,
300-
"darwin:aarch64:jdk-latest" : tier3,
301-
"windows:amd64:jdk-latest" : tier3,
300+
"darwin:aarch64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST),
301+
"windows:amd64:jdk-latest" : tier3 + require(GRAAL_JDK_LATEST),
302302
}),
303303
"python-unittest-cpython": cpygate + platform_spec(no_jobs) + platform_spec({
304304
"linux:amd64:jdk-latest" : tier1,
@@ -338,7 +338,7 @@
338338
}),
339339
// tests with sandboxed backends for various modules (posix, sha3, ctypes, ...)
340340
"python-unittest-sandboxed": gpgate_ee + platform_spec(no_jobs) + platform_spec({
341-
"linux:amd64:jdk-latest" : tier2,
341+
"linux:amd64:jdk-latest" : tier3,
342342
}),
343343
"python-svm-unittest-sandboxed": gpgate_ee + provide(GPYEE_NATIVE_STANDALONE) + platform_spec(no_jobs) + platform_spec({
344344
"linux:amd64:jdk-latest" : tier3,

ci/python-gate.libsonnet

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,9 @@
310310
else
311311
["set-export", "GRAAL_JDK_HOME", "../graal/sdk/mxbuild/*/GRAALVM_COMMUNITY_JAVA" + jdk_version + "/graalvm-community-*"]
312312
],
313+
environment+: {
314+
MX_BUILD_SHALLOW_DEPENDENCY_CHECKS: "true",
315+
},
313316
requireArtifacts+: [{
314317
name: artifact_name,
315318
autoExtract: false,

0 commit comments

Comments
 (0)