[GR-60724] Remove jdk-21 libgraal CI jobs.

PullRequest: graal/19709
oracle · Jan 5, 2025 · 0e2520d · 0e2520d
2 parents 3888b69 + 8a7c399
commit 0e2520d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 37 deletions.
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugOptions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugOptions.java
@@ -252,7 +252,7 @@ public static String getDumpDirectoryName(OptionValues options) {
             dumpDir = getPath(DumpPath.getValue(options));
         } else {
             Date date = new Date(GraalServices.getGlobalTimeStamp());
-            SimpleDateFormat formatter = new SimpleDateFormat("YYYY.MM.dd.HH.mm.ss.SSS");
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss.SSS");
             dumpDir = getPath(DumpPath.getValue(options), formatter.format(date));
         }
         dumpDir = getAbsolutePath(dumpDir);

diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -752,7 +752,8 @@
             ],
             "checkstyle": "com.oracle.svm.hosted",
             "workingSets": "SVM",
-            "jacoco" : "include",
+            # disable coverage as long it cannot run on JDK latest [GR-59586]
+            "jacoco" : "exclude",
             # disable SpotBugs as long JDK 22 is unsupported [GR-49566]
             "spotbugs" : "false",
         },
@@ -786,7 +787,8 @@
             ],
             "checkstyle": "com.oracle.svm.hosted",
             "workingSets": "SVM",
-            "jacoco" : "include",
+            # disable coverage as long it cannot run on JDK latest [GR-59586]
+            "jacoco" : "exclude",
             # disable SpotBugs as long JDK 22 is unsupported [GR-49566]
             "spotbugs" : "false",
         },

diff --git a/vm/ci/ci_common/libgraal.jsonnet b/vm/ci/ci_common/libgraal.jsonnet
@@ -35,10 +35,7 @@ local galahad = import '../../../ci/ci_common/galahad-common.libsonnet';
   },
 
   # enable asserts in the JVM building the image and enable asserts in the resulting native image
-  libgraal_compiler:: self.libgraal_compiler_base() {
-    # Tests that dropping libgraal into OracleJDK works (see mx_vm_gate.py)
-    downloads +: if utils.contains(self.name, 'labsjdk-21') then {"ORACLEJDK_JAVA_HOME" : graal_common.jdks_data["oraclejdk21"]} else {}
-  },
+  libgraal_compiler:: self.libgraal_compiler_base(),
   libgraal_compiler_zgc:: self.libgraal_compiler_base(extra_vm_args=['-XX:+UseZGC']),
   # enable economy mode building with the -Ob flag
   libgraal_compiler_quickbuild:: self.libgraal_compiler_base(quickbuild_args=['-Ob']) + {
@@ -86,10 +83,7 @@ local galahad = import '../../../ci/ci_common/galahad-common.libsonnet';
     "gate-vm-libgraal_compiler_quickbuild-labsjdk-latest-linux-amd64": {},
     "gate-vm-libgraal_compiler-labsjdk-latest-linux-aarch64": {},
     "gate-vm-libgraal_compiler-labsjdk-latest-darwin-aarch64": {},
-    "gate-vm-libgraal_compiler_quickbuild-labsjdk-latest-windows-amd64": {} + galahad.exclude,
-
-    "gate-vm-libgraal_compiler-labsjdk-21-linux-amd64": {},
-    "gate-vm-libgraal_truffle-labsjdk-21-linux-amd64": {}
+    "gate-vm-libgraal_compiler_quickbuild-labsjdk-latest-windows-amd64": {} + galahad.exclude
   },
 
   local gates = g.as_gates(gate_jobs),
@@ -98,10 +92,7 @@ local galahad = import '../../../ci/ci_common/galahad-common.libsonnet';
   local dailies = {
     "daily-vm-libgraal_truffle_zgc-labsjdk-latest-linux-amd64": {},
 
-    "daily-vm-libgraal_compiler_zgc-labsjdk-21-linux-amd64": {},
-    "daily-vm-libgraal_compiler_quickbuild-labsjdk-21-linux-amd64": {},
     "daily-vm-libgraal_truffle_quickbuild-labsjdk-latest-linux-amd64": t("1:10:00"),
-    "daily-vm-libgraal_truffle_quickbuild-labsjdk-21-linux-amd64": t("1:10:00"),
   } + g.as_dailies(gate_jobs),
 
   # See definition of `weeklies` local variable in ../../compiler/ci_common/gate.jsonnet
@@ -140,7 +131,6 @@ local galahad = import '../../../ci/ci_common/galahad-common.libsonnet';
                  monthlies_manifest=monthlies).build +
     vm["vm_java_" + jdk]
     for jdk in [
-      "21",
       "Latest"
     ]
     for os_arch in all_os_arches
@@ -179,8 +169,8 @@ local galahad = import '../../../ci/ci_common/galahad-common.libsonnet';
     ]
   ],
 
-  # Coverage builds only on jdk21 (GR-46676)
-  local coverage_jdk21_builds = [
+  # Coverage builds
+  local coverage_jdkLatest_builds = [
     c.vm_base(os(os_arch), arch(os_arch), 'gate') +
     svm_common(os_arch, jdk) +
     vm.custom_vm +
@@ -192,7 +182,7 @@ local galahad = import '../../../ci/ci_common/galahad-common.libsonnet';
                  monthlies_manifest=monthlies).build +
     vm["vm_java_" + jdk]
     for jdk in [
-      "21"
+      "Latest"
     ]
     for os_arch in [
       "linux-amd64",
@@ -208,7 +198,7 @@ local galahad = import '../../../ci/ci_common/galahad-common.libsonnet';
   local all_builds =
     all_platforms_builds +
     all_platforms_zgc_builds +
-    coverage_jdk21_builds,
+    coverage_jdkLatest_builds,
 
   builds: if
       g.check_manifest(gates, all_builds, std.thisFile, "gates").result

diff --git a/vm/mx.vm/mx_vm_gate.py b/vm/mx.vm/mx_vm_gate.py
@@ -155,24 +155,6 @@ def _test_libgraal_basic(extra_vm_arguments, libgraal_location):
         jres.append(('LibGraal JRE', libgraal_jre, []))
         atexit.register(mx.rmtree, libgraal_jre)
 
-    # Tests that dropping libgraal into OracleJDK works
-    oraclejdk = mx.get_env('ORACLEJDK_JAVA_HOME')
-    if oraclejdk:
-        oraclejdk_confg = mx.JDKConfig(oraclejdk)
-        # Only run this test if JAVA_HOME and ORACLEJDK_JAVA_HOME have
-        # the same major Java version. Even then there's a chance of incompatibility
-        # if labsjdk is based on a different OracleJDK build.
-        if graalvm_jdk.javaCompliance.value >= 22 and graalvm_jdk.javaCompliance.value == oraclejdk_confg.javaCompliance.value:
-            libjvmci = libgraal_location
-            assert exists(libjvmci), ('missing', libjvmci)
-            oraclejdk_libgraal = abspath('oraclejdk_libgraal')
-            if exists(oraclejdk_libgraal):
-                mx.rmtree(oraclejdk_libgraal)
-            shutil.copytree(oraclejdk, oraclejdk_libgraal)
-            shutil.copy(libjvmci, join(oraclejdk_libgraal, 'bin' if mx.get_os() == 'windows' else 'lib'))
-            jres.append(('OracleJDK+libgraal', oraclejdk_libgraal, ['-XX:+UnlockExperimentalVMOptions', '-XX:+UseJVMCICompiler']))
-            atexit.register(mx.rmtree, oraclejdk_libgraal)
-
     expect = r"Using compiler configuration '[^']+' \(\"[^\"]+\"\) provided by [\.\w]+ loaded from a[ \w]* Native Image shared library"
     compiler_log_file = abspath('graal-compiler.log')