From 90bfb0d57e80fc24f6de0f91c3d79ba0f7225658 Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Fri, 7 Feb 2025 16:26:23 +0100
Subject: [PATCH 1/2] CI: Move coverage jobs to jdk-latest.

---
 graal-js/ci.jsonnet     | 4 ++--
 graal-nodejs/ci.jsonnet | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/graal-js/ci.jsonnet b/graal-js/ci.jsonnet
index af268c72b5a..1a54fa3ae9a 100644
--- 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
index b4d8319e6eb..c956a677998 100644
--- 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,
 }

From 846aeec99a6e529cfea761aea6c855a34ae6b3cb Mon Sep 17 00:00:00 2001
From: Andreas Woess <andreas.woess@oracle.com>
Date: Fri, 7 Feb 2025 16:36:41 +0100
Subject: [PATCH 2/2] CI: Remove all non-style jdk-21 nodejs jobs.

---
 ci.jsonnet              | 1 +
 graal-nodejs/ci.jsonnet | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci.jsonnet b/ci.jsonnet
index c7fe1f38ae2..43d06ad3837 100644
--- 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-nodejs/ci.jsonnet b/graal-nodejs/ci.jsonnet
index c956a677998..15ee1c4c4ca 100644
--- a/graal-nodejs/ci.jsonnet
+++ b/graal-nodejs/ci.jsonnet
@@ -191,7 +191,7 @@ 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([