Import JDK definitions from the common ci file of graal.

Author: ansalond

common.json

@@ -0,0 +1,29 @@
+{
+  "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
+
+  "jdks": {
+    "oraclejdk8":      {"name": "oraclejdk", "version": "8u251+08-jvmci-20.2-b02", "platformspecific": true },
+    "openjdk8":        {"name": "openjdk",   "version": "8u252+09-jvmci-20.2-b02", "platformspecific": true },
+    "oraclejdk8Debug": {"name": "oraclejdk", "version": "8u251+08-jvmci-20.2-b02-fastdebug", "platformspecific": true },
+    "oraclejdk11":     {"name": "oraclejdk", "version": "11.0.6+8", "platformspecific": true },
+    "oraclejdk15":     {"name": "oraclejdk", "version": "15+27", "platformspecific": true },
+    "openjdk11":       {"name": "openjdk",   "version": "11.0.3+7", "platformspecific": true },
+    "labsjdk-ce-11":   {"name": "labsjdk",   "version": "ce-11.0.7+10-jvmci-20.2-b02", "platformspecific": true },
+    "labsjdk-ee-11":   {"name": "labsjdk",   "version": "ee-11.0.7+8-jvmci-20.2-b02", "platformspecific": true }
+  },
+
+  "sulong": {
+    "deps": {
+      "linux": {
+        "packages": {
+          "cmake": "==3.15.2"
+        }
+      },
+      "darwin": {
+        "packages": {
+          "cmake": "==3.15.2"
+        }
+      }
+    }
+  }
+}

common.jsonnet

@@ -1,17 +1,15 @@
-{
-  local labsjdk8 = {name: 'oraclejdk', version: '8u251+08-jvmci-20.2-b02', platformspecific: true},
-
-  local labsjdk_ce_11 = {name : 'labsjdk', version : 'ce-11.0.7+10-jvmci-20.2-b02', platformspecific: true},
+local jdks = (import "common.json").jdks;
 
+{
   jdk8: {
     downloads+: {
-      JAVA_HOME: labsjdk8,
+      JAVA_HOME: jdks.oraclejdk8,
     },
   },
 
   jdk11: {
     downloads+: {
-      JAVA_HOME: labsjdk_ce_11,
+      JAVA_HOME: jdks["labsjdk-ce-11"],
     },
   },
 

graal-js/mx.graal-js/mx_graal_js.py

@@ -31,7 +31,7 @@
 
 import mx_graal_js_benchmark
 import mx, mx_sdk
-from mx_gate import Task, add_gate_runner
+from mx_gate import Tags, Task, add_gate_runner, prepend_gate_runner
 from mx_unittest import unittest
 
 _suite = mx.suite('graal-js')
@@ -41,6 +41,11 @@ class GraalJsDefaultTags:
     tck = 'tck'
     all = 'all'
 
+def _graal_js_pre_gate_runner(args, tasks):
+    with Task('CI Setup Check', tasks, tags=[Tags.style]) as t:
+        if t:
+            mx.command_function('verify-ci')([])
+
 def _graal_js_gate_runner(args, tasks):
     with Task('CheckCopyrights', tasks, tags=['style']) as t:
         if t:
@@ -86,6 +91,7 @@ def _graal_js_gate_runner(args, tasks):
             import mx_truffle
             mx_truffle._tck([])
 
+prepend_gate_runner(_suite, _graal_js_pre_gate_runner)
 add_gate_runner(_suite, _graal_js_gate_runner)
 
 class ArchiveProject(mx.ArchivableProject):
@@ -313,11 +319,16 @@ def is_included(path):
     boot_jars=['graal-js:GRAALJS_SCRIPTENGINE'],
 ))
 
+def verify_ci(args):
+    """Verify CI configuration"""
+    mx.verify_ci(args, mx.suite('regex'), _suite, 'common.json')
+
 mx.update_commands(_suite, {
     'deploy-binary-if-master' : [deploy_binary_if_master, ''],
     'js' : [js, '[JS args|VM options]'],
     'nashorn' : [nashorn, '[JS args|VM options]'],
     'test262': [test262, ''],
     'testnashorn': [testnashorn, ''],
     'testv8': [testv8, ''],
+    'verify-ci': [verify_ci, ''],
 })