CI: Move coverage jobs to jdk-latest.

oracle · Feb 8, 2025 · 90bfb0d · 90bfb0d
1 parent 5f74353
commit 90bfb0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/graal-js/ci.jsonnet b/graal-js/ci.jsonnet
@@ -21,7 +21,7 @@ local ci = import '../ci.jsonnet';
     },
   },
 
-  local gateCoverage = {
+  local gateCoverage = common.oraclejdk21.tools_java_home + {
     coverage_gate_args:: ['--jacoco-omit-excluded', '--jacoco-relativize-paths', '--jacoco-omit-src-gen', '--jacoco-format', 'lcov', '--jacocout', 'coverage'],
     run+: [
       ['mx', '--dynamicimports', '/wasm', 'gate', '-B=--force-deprecation-as-warning', '-B=-A-J-Dtruffle.dsl.SuppressWarnings=truffle', '--strict-mode', '--tags', 'build,coverage'] + self.coverage_gate_args,
@@ -178,7 +178,7 @@ local ci = import '../ci.jsonnet';
     # Note: weekly coverage is sync'ed with the graal repo (while ondemand is not).
     graalJs + common.weekly    + gateCoverage                                                             + {name: 'coverage'},
     graalJs + common.ondemand  + gateCoverage                                                             + {name: 'coverage'},
-  ], platforms=[common.jdk21 + common.linux_amd64]),
+  ], platforms=[common.jdklatest + common.linux_amd64]),
 
   // Benchmark builds; need to run on a benchmark machine
   local benchBuilds = generateBuilds([

diff --git a/graal-nodejs/ci.jsonnet b/graal-nodejs/ci.jsonnet
@@ -70,7 +70,7 @@ local cicommon = import '../ci/common.jsonnet';
     ]) else []),
   },
 
-  local gateCoverage = {
+  local gateCoverage = common.oraclejdk21.tools_java_home + {
     suiteimports+:: ['wasm', 'tools'],
     coverage_gate_args:: ['--jacoco-omit-excluded', '--jacoco-relativize-paths', '--jacoco-omit-src-gen', '--jacoco-format', 'lcov', '--jacocout', 'coverage'],
     run+: [
@@ -199,7 +199,7 @@ local cicommon = import '../ci/common.jsonnet';
     graalNodeJs + common.weekly    + gateCoverage                                                                                  + {name: 'coverage'},
     graalNodeJs + common.ondemand  + gateCoverage                                                                                  + {name: 'coverage'},
 
-  ], platforms=[common.jdk21 + common.linux_amd64]),
+  ], platforms=[common.jdklatest + common.linux_amd64]),
 
   builds: styleBuilds + testingBuilds + otherBuilds,
 }