[GR-62041] Move JS coverage jobs to jdk-latest and remove jdk-21 node…

…js jobs. PullRequest: js/3411
oracle · Feb 11, 2025 · 77a8dcc · 77a8dcc
2 parents 12493aa + 846aeec
commit 77a8dcc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -106,6 +106,7 @@ local graalNodeJs = import 'graal-nodejs/ci.jsonnet';
     common.jdk21 + common.linux_amd64,
     common.jdklatest + common.linux_amd64,
   ],
+  jdklatestPlatforms:: [p for p in $.supportedPlatforms if p.jdk_name == 'jdk-latest'],
 
   local artifact_name(jdk, edition, os, arch, prefix='js', suffix='') =
     assert prefix != '' && edition != '' && jdk != '' && os != '' && arch != '';

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+: [
@@ -191,15 +191,15 @@ local cicommon = import '../ci/common.jsonnet';
 
     graalNodeJs + vm_env + build            + testNode(parallelHttp2, max_heap='4G')                                               + {name: 'parallel-http2'} +
       promoteToTarget(common.postMerge, [ci.mainGatePlatform], override=true),
-  ]], defaultTarget=common.weekly),
+  ]], platforms=ci.jdklatestPlatforms, defaultTarget=common.weekly),
 
   // Builds that only need to run on one platform
   local otherBuilds = generateBuilds([
     # Note: weekly coverage is sync'ed with the graal repo (while ondemand is not).
     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,
 }