Run Sulong coverage jobs with a GraalVM JDK 21 as base JDK.

Author: rschatz

sulong/ci/ci.jsonnet

@@ -120,11 +120,11 @@ local sc = (import "ci_common/sulong-common.jsonnet");
   coverage_builds::
     sc.mapPrototypePlatformName([sc.weekly + $.sulong + sc.coverage($.regular_builds)],
     [
-      [sc.linux_amd64,    [sc.labsjdk21]],
-      [sc.darwin_amd64,   [sc.labsjdk21]],
-      [sc.windows_amd64,  [sc.labsjdk21]],
-      [sc.linux_aarch64,  [sc.labsjdk21]],
-      [sc.darwin_aarch64, [sc.labsjdk21]],
+      [sc.linux_amd64,    [sc.graalvmee21]],
+      [sc.darwin_amd64,   [sc.graalvmee21]],
+      [sc.windows_amd64,  [sc.graalvmee21]],
+      [sc.linux_aarch64,  [sc.graalvmee21]],
+      [sc.darwin_aarch64, [sc.graalvmee21]],
     ],
     [
       { name: "weekly-sulong-coverage-jdk21-linux-amd64",    timelimit: "2:00:00" },

sulong/ci/ci_common/sulong-common.jsonnet

@@ -166,7 +166,7 @@ local sulong_deps = common.deps.sulong;
       skipPlatform:: coverageTags == [],
       gateTags:: ["build"] + coverageTags,
       # The Jacoco annotations interfere with partial evaluation. Use the DefaultTruffleRuntime to disable compilation just for the coverage runs.
-      extra_mx_args+: ["--no-jacoco-exclude-truffle", "-J-Dtruffle.TruffleRuntime=com.oracle.truffle.api.impl.DefaultTruffleRuntime", "-J-Dpolyglot.engine.WarnInterpreterOnly=false"],
+      extra_mx_args+: ["-J-Dtruffle.TruffleRuntime=com.oracle.truffle.api.impl.DefaultTruffleRuntime", "-J-Dpolyglot.engine.WarnInterpreterOnly=false"],
       extra_gate_args+: ["--jacoco-relativize-paths", "--jacoco-omit-src-gen", "--jacocout", "coverage", "--jacoco-format", "lcov"],
       teardown+: [
         ["mx", "sversions", "--print-repositories", "--json", "|", "coverage-uploader.py", "--associated-repos", "-"],