Skip to content

Commit fdd92d4

Browse files
timfeltimfel
committed
Separate building of standalones into separate smoke test jobs
1 parent 2899714 commit fdd92d4

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

‎ci.jsonnet‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
// gates
138138
// -----------------------------------------------------------------------------------------------------------------
139139
local gate_task_dict = {
140-
"build": gpgate + platform_spec(no_jobs) + platform_spec({
140+
"python-jvm-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({
@@ -183,7 +183,7 @@
183183
"linux:amd64:jdk-latest" : tier2,
184184
}),
185185
"python-unittest-posix": gpgate + platform_spec(no_jobs) + platform_spec({
186-
"linux:amd64:jdk-latest" : tier1 + require(GPY_JVM_STANDALONE),
186+
"linux:amd64:jdk-latest" : tier2 + require(GPY_JVM_STANDALONE),
187187
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
188188
"darwin:amd64:jdk-latest" : daily + t("01:30:00") + require(GPY_JVM_STANDALONE),
189189
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
@@ -205,7 +205,7 @@
205205
"darwin:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
206206
"darwin:amd64:jdk-latest" : daily + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
207207
"windows:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE) + batches(2),
208-
"linux:amd64:jdk-latest" : tier1 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
208+
"linux:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
209209
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
210210
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
211211
"windows:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
@@ -222,13 +222,13 @@
222222
"darwin:aarch64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE),
223223
"darwin:amd64:jdk-latest" : daily + t("02:00:00") + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
224224
"windows:amd64:jdk21" : daily + t("02:00:00") + require(GPY_JVM21_STANDALONE) + batches(2),
225-
"linux:amd64:jdk-latest" : tier1 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
225+
"linux:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
226226
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
227227
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST),
228228
"windows:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE) + require(GRAAL_JDK_LATEST) + batches(2),
229229
}),
230230
"python-junit-vfsutils": gpgate + platform_spec(no_jobs) + platform_spec({
231-
"linux:amd64:jdk-latest" : tier1 + require(GPY_JVM_STANDALONE),
231+
"linux:amd64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
232232
"linux:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
233233
"darwin:aarch64:jdk-latest" : tier3 + require(GPY_JVM_STANDALONE),
234234
"windows:amd64:jdk-latest" : post_merge + t("03:59:00") + require(GPY_JVM_STANDALONE),
@@ -244,7 +244,7 @@
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" : tier1,
247+
"linux:amd64:jdk-latest" : tier2,
248248
"linux:aarch64:jdk-latest" : tier3,
249249
"darwin:amd64:jdk-latest" : daily + t("01:30:00"),
250250
"darwin:aarch64:jdk-latest" : tier3,
@@ -258,20 +258,23 @@
258258
"linux:aarch64:jdk21" : daily + t("01:00:00"),
259259
"darwin:aarch64:jdk21" : daily + t("01:30:00"),
260260
"windows:amd64:jdk21" : daily + t("01:30:00"),
261-
"linux:amd64:jdk-latest" : tier1 + provide(GRAAL_JDK_LATEST),
261+
"linux:amd64:jdk-latest" : tier3 + provide(GRAAL_JDK_LATEST),
262262
"linux:aarch64:jdk-latest" : tier3 + provide(GRAAL_JDK_LATEST),
263263
"darwin:amd64:jdk-latest" : daily + t("01:30:00") + provide(GRAAL_JDK_LATEST),
264264
"darwin:aarch64:jdk-latest" : tier3 + provide(GRAAL_JDK_LATEST),
265265
"windows:amd64:jdk-latest" : tier3 + provide(GRAAL_JDK_LATEST),
266266
}),
267267
"python-junit-polyglot-isolates": gpgate_ee + platform_spec(no_jobs) + platform_spec({
268-
"linux:amd64:jdk-latest" : tier1,
268+
"linux:amd64:jdk-latest" : tier3,
269269
"linux:aarch64:jdk-latest" : tier3,
270270
"darwin:aarch64:jdk-latest" : tier3,
271271
"windows:amd64:jdk-latest" : tier3,
272272
}),
273+
"python-svm-build": gpgate + platform_spec(no_jobs) + platform_spec({
274+
"linux:amd64:jdk-latest" : tier2 + provide(GPY_NATIVE_STANDALONE),
275+
}),
273276
"python-svm-unittest": gpgate + platform_spec(no_jobs) + platform_spec({
274-
"linux:amd64:jdk-latest" : tier1 + provide(GPY_NATIVE_STANDALONE),
277+
"linux:amd64:jdk-latest" : tier2 + require(GPY_NATIVE_STANDALONE),
275278
"linux:aarch64:jdk-latest" : tier3 + provide(GPY_NATIVE_STANDALONE),
276279
"darwin:amd64:jdk-latest" : daily + t("01:30:00") + provide(GPY_NATIVE_STANDALONE),
277280
"darwin:aarch64:jdk-latest" : tier3 + provide(GPY_NATIVE_STANDALONE),

‎mx.graalpython/mx_graalpython.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ class GraalPythonTags(object):
535535
junit = 'python-junit'
536536
junit_maven = 'python-junit-maven'
537537
junit_maven_isolates = 'python-junit-polyglot-isolates'
538+
jvmbuild = 'python-jvm-build'
538539
unittest = 'python-unittest'
539540
unittest_cpython = 'python-unittest-cpython'
540541
unittest_sandboxed = 'python-unittest-sandboxed'
@@ -551,6 +552,7 @@ class GraalPythonTags(object):
551552
unittest_maven_plugin_long_run = 'python-unittest-maven-plugin-long-run'
552553
junit_vfsutils = 'python-junit-vfsutils'
553554
tagged = 'python-tagged-unittest'
555+
svmbuild = 'python-svm-build'
554556
svmunit = 'python-svm-unittest'
555557
svmunit_sandboxed = 'python-svm-unittest-sandboxed'
556558
graalvm = 'python-graalvm'
@@ -1253,6 +1255,10 @@ def graalpython_gate_runner(args, tasks):
12531255
], env=env)
12541256

12551257
# Unittests on JVM
1258+
with Task('GraalPython JVM build', tasks, tags=[GraalPythonTags.jvmbuild]) as task:
1259+
if task:
1260+
graalpy_standalone_jvm()
1261+
12561262
with Task('GraalPython Python unittests', tasks, tags=[GraalPythonTags.unittest]) as task:
12571263
if task:
12581264
run_python_unittests(
@@ -1412,6 +1418,10 @@ def graalpython_gate_runner(args, tasks):
14121418
run_tagged_unittests(graalpy_standalone_native(), nonZeroIsFatal=(not is_collecting_coverage()), report=report())
14131419

14141420
# Unittests on SVM
1421+
with Task('GraalPython build on SVM', tasks, tags=[GraalPythonTags.svmbuild]) as task:
1422+
if task:
1423+
graalpy_standalone_native()
1424+
14151425
with Task('GraalPython tests on SVM', tasks, tags=[GraalPythonTags.svmunit]) as task:
14161426
if task:
14171427
run_python_unittests(graalpy_standalone_native(), parallel=8, report=report())

0 commit comments

Comments
 (0)