added oraclejdk22 libgraal gate

Author: dougxc

ci/common.jsonnet

@@ -23,6 +23,9 @@ local common_json = import "../common.json";
   } + {
     [name]: common_json.jdks[name] + { jdk_version:: 21 }
     for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21")
+  } + {
+    [name]: common_json.jdks[name] + { jdk_version:: 22 }
+    for name in ["oraclejdk22"]
   },
   assert std.assertEqual(std.objectFields(common_json.jdks), std.objectFields(jdks_data)),
 
@@ -58,6 +61,7 @@ local common_json = import "../common.json";
     "windows-jdk19": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
     "windows-jdk20": { packages+: { "devkit:VS2022-17.1.0+1": "==0" }},
     "windows-jdk21": { packages+: { "devkit:VS2022-17.1.0+1": "==1" }},
+    "windows-jdk22": { packages+: { "devkit:VS2022-17.1.0+1": "==1" }},
     "linux-jdk17": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
     "linux-jdk19": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},
     "linux-jdk20": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }},

common.json

@@ -40,8 +40,9 @@
     "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+26-jvmci-23.1-b07-sulong", "platformspecific": true },
     "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+26-jvmci-23.1-b07", "platformspecific": true },
     "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+26-jvmci-23.1-b07-debug", "platformspecific": true },
-    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+26-jvmci-23.1-b07-sulong", "platformspecific": true }
+    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+26-jvmci-23.1-b07-sulong", "platformspecific": true },
 
+    "oraclejdk22":        {"name": "jpg-jdk",   "version": "22",      "build_id": "1", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}
   },
 
   "eclipse": {

vm/ci/ci_common/libgraal.jsonnet

@@ -75,6 +75,7 @@ local utils = import '../../../ci/ci_common/common-utils.libsonnet';
     "gate-vm-libgraal_compiler_zgc-labsjdk-21-linux-amd64": {},
     "gate-vm-libgraal_compiler_quickbuild-labsjdk-21-linux-amd64": {},
     "gate-vm-libgraal_truffle_quickbuild-labsjdk-21-linux-amd64": t("1:10:00"),
+    "gate-vm-libgraal_compiler-oraclejdk-22-linux-amd64": {},
   },
 
   # See definition of `dailies` local variable in ../../compiler/ci_common/gate.jsonnet
@@ -115,6 +116,7 @@ local utils = import '../../../ci/ci_common/common-utils.libsonnet';
     vm["custom_vm_" + os(os_arch)] +
     g.make_build(jdk, os_arch, task, extra_tasks=self, suite="vm",
                  include_common_os_arch=false,
+                 jdk_name = if jdk == "22" then "oraclejdk" else "labsjdk",
                  gates_manifest=gates,
                  dailies_manifest=dailies,
                  weeklies_manifest=weeklies,
@@ -133,6 +135,28 @@ local utils = import '../../../ci/ci_common/common-utils.libsonnet';
     ]
   ],
 
+  # Builds run on OracleJDK22
+  local oraclejdk22_builds = [
+    c["gate_vm_" + underscore(os_arch)] +
+    svm_common(os_arch, jdk) +
+    vm["custom_vm_" + os(os_arch)] +
+    g.make_build(jdk, os_arch, task, extra_tasks=self, suite="vm",
+                 include_common_os_arch=false,
+                 jdk_name="oraclejdk",
+                 gates_manifest=gates,
+                 dailies_manifest=dailies,
+                 weeklies_manifest=weeklies,
+                 monthlies_manifest=monthlies).build +
+    vm["vm_java_" + jdk]
+    for jdk in [
+      "22"
+    ]
+    for os_arch in ["linux-amd64"]
+    for task in [
+      "libgraal_compiler",
+    ]
+  ],
+
   local adjust_windows_version(gate) = (
       # replace 2016 with 2019
      gate + { capabilities: [ if x == "windows_server_2016" then "windows_server_2019" else x for x in gate.capabilities ] }
@@ -161,8 +185,8 @@ local utils = import '../../../ci/ci_common/common-utils.libsonnet';
     ]
   ],
 
-  # Builds run on only on linux-amd64-jdk21
-  local linux_amd64_jdk21_builds = [
+  # Coverage builds only on jdk21
+  local coverage_jdk21_builds = [
     c["gate_vm_" + underscore(os_arch)] +
     svm_common(os_arch, jdk) +
     vm["custom_vm_" + os(os_arch)] +
@@ -189,8 +213,9 @@ local utils = import '../../../ci/ci_common/common-utils.libsonnet';
   # Complete set of builds defined in this file
   local all_builds =
     all_platforms_builds +
+    oraclejdk22_builds +
     all_platforms_zgc_builds +
-    linux_amd64_jdk21_builds,
+    coverage_jdk21_builds,
 
   builds: if
       g.check_manifest(gates, all_builds, std.thisFile, "gates").result

vm/ci/ci_includes/vm.jsonnet

@@ -10,6 +10,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
   vm_java_17:: graal_common.labsjdk17 + vm_common.vm_env_mixin('17'),
   vm_java_20:: graal_common.labsjdk20 + vm_common.vm_env_mixin('20'),
   vm_java_21:: graal_common.labsjdk21 + vm_common.vm_env_mixin('21'),
+  vm_java_22:: graal_common.oraclejdk22 + vm_common.vm_env_mixin('22'),
 
   vm_java_17_llvm:: self.vm_java_17 + graal_common['labsjdk-ce-17-llvm'],
   vm_java_20_llvm:: self.vm_java_20 + graal_common['labsjdk-ce-20-llvm'],