[GR-18553] Use JDK versions from the common.json file from the graal repository

* Check in CI that common.json is up to date with the import.

Author: eregon

ci.jsonnet

@@ -20,6 +20,8 @@ local restrict_builds_to = [];
 # and it would still work.
 local utils = import "utils.libsonnet";
 
+local jdks = (import "common.json").jdks;
+
 # All builds are composed **directly** from **independent disjunct composable**
 # jsonnet objects defined in here. Use `+:` to make the objects or arrays
 # stored in fields composable, see http://jsonnet.org/docs/tutorial.html#oo.
@@ -211,33 +213,20 @@ local part_definitions = {
 
     v8: with_path {
       downloads+: {
-        JAVA_HOME: {
-          name: "oraclejdk",
-          # Update the openjdk8 version too below when updating this one
-          version: "8u231-jvmci-19.3-b05",
-          platformspecific: true,
-        },
+        JAVA_HOME: jdks.oraclejdk8,
       },
     },
 
     # For `jt install jvmci`, verify that `jt install jvmci` still works when changing the version
     openjdk8: with_path {
       downloads+: {
-        JAVA_HOME: {
-          name: "openjdk",
-          version: "8u232-jvmci-19.3-b05",
-          platformspecific: true,
-        },
+        JAVA_HOME: jdks.openjdk8,
       },
     },
 
     v11: with_path {
       downloads+: {
-        JAVA_HOME: {
-          name: "labsjdk",
-          version: "ce-11.0.5+10-jvmci-19.3-b05",
-          platformspecific: true,
-        },
+        JAVA_HOME: jdks["labsjdk-ce-11"],
       },
     },
   },

common.json

@@ -0,0 +1,11 @@
+{
+  "jdks": {
+    "oraclejdk8":      {"name": "oraclejdk", "version": "8u231-jvmci-19.3-b06", "platformspecific": true },
+    "openjdk8":        {"name": "openjdk",   "version": "8u232-jvmci-19.3-b06", "platformspecific": true },
+    "oraclejdk8Debug": {"name": "oraclejdk", "version": "8u231-jvmci-19.3-b06-fastdebug", "platformspecific": true },
+    "oraclejdk11":     {"name": "oraclejdk", "version": "11.0.3+12", "platformspecific": true },
+    "openjdk11":       {"name": "openjdk",   "version": "11.0.3+7", "platformspecific": true },
+    "labsjdk-ce-11":   {"name": "labsjdk",   "version": "ce-11.0.5+10-jvmci-19.3-b06", "platformspecific": true },
+    "labsjdk-ee-11":   {"name": "labsjdk",   "version": "ee-11.0.5+10-jvmci-19.3-b06", "platformspecific": true }
+  }
+}

mx.truffleruby/mx_truffleruby.py

@@ -108,6 +108,10 @@ def ruby_testdownstream_sulong(args):
     jt('test', 'cexts')
     jt('test', 'bundle')
 
+def verify_ci(args):
+    """Verify CI configuration"""
+    mx.verify_ci(args, mx.suite('truffle'), _suite, 'common.json')
+
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
     suite=_suite,
     name='TruffleRuby license files',
@@ -185,4 +189,5 @@ def ruby_testdownstream_sulong(args):
     'ruby_testdownstream_aot': [ruby_testdownstream_aot, 'aot_bin'],
     'ruby_testdownstream_hello': [ruby_testdownstream_hello, ''],
     'ruby_testdownstream_sulong': [ruby_testdownstream_sulong, ''],
+    'verify-ci' : [verify_ci, '[options]'],
 })

tool/jt.rb

@@ -144,9 +144,9 @@ def jvmci_update_and_version
         raise 'Could not parse JDK update and JVMCI version from $JVMCI_VERSION'
       end
     else
-      ci = File.read("#{TRUFFLERUBY_DIR}/ci.jsonnet")
-      unless /JAVA_HOME: \{\n\s*name: "openjdk",\n\s*version: "8u(\d+)-(jvmci-.+)",/ =~ ci
-        raise 'JVMCI version not found in ci.jsonnet'
+      ci = File.read("#{TRUFFLERUBY_DIR}/common.json")
+      unless /{\s*"name"\s*:\s*"openjdk"\s*,\s*"version"\s*:\s*"8u(\d+)-(jvmci-[^"]+)"\s*,/ =~ ci
+        raise 'JVMCI version not found in jdks.json'
       end
     end
     update, jvmci = $1, $2
@@ -2147,6 +2147,8 @@ def lint
     #  - building with jdt in the ci definition could be dropped since fullbuild builds with JDT
     mx 'spotbugs'
 
+    mx 'verify-ci'
+
     check_parser
     check_documentation_urls
     check_license