[GR-16229] ci utils

PullRequest: graalpython/534

Author: cosminbasca

ci.jsonnet

@@ -3,7 +3,7 @@ local const = import 'ci_common/constants.libsonnet';
 local builder = import 'ci_common/builder.libsonnet';
 
 {
-    overlay: "123dda879b0003af4b8d529e71fceb15bb26e94e",
+    overlay: "5c24d0dc41c15d1f00635f91c50c51e8cefae33e",
 
     // ======================================================================================================
     //

ci_common/builder.libsonnet

@@ -62,12 +62,17 @@ local mixins = import 'mixins.libsonnet';
     testGateTime(type, platform, timelimit)::
         baseGraalGate + {tags:: "python-"+type} + mixins.getPlatform(platform) + {name: "python-"+ type +"-"+platform} + {timelimit: timelimit},
 
-    local styleGate = baseGraalGate + mixins.eclipse + mixins.linux + {
-        tags:: "style,fullbuild,python-license",
+    local baseStyleGate = baseGraalGate + mixins.eclipse + mixins.linux + {
+        tags:: "style",
         name: "python-style",
 
         timelimit: const.TIME_LIMIT["1h"],
     },
+    baseStyleGate:: baseStyleGate,
+
+    local styleGate = baseStyleGate + {
+        tags:: super.tags + ",fullbuild,python-license",
+    },
     styleGate:: styleGate,
 
     local graalVmGate = baseGraalGate + mixins.linux {

ci_common/utils.libsonnet

@@ -17,4 +17,27 @@
     // utility for array contains
     contains(array, value)::
         std.count(array, value) > 0,
+
+    // validation
+    isGraalVmVm(name)::
+        std.startsWith(name, "graalvm_"),
+
+    isGraalPythonVm(name)::
+        std.startsWith(name, "graalpython"),
+
+    isBaselineVm(name)::
+        std.startsWith(name, "cpython") || std.startsWith(name, "pypy"),
+
+    local isBuilder = function(builder)
+        std.objectHas(builder, "run"),
+    isBuilder:: isBuilder,
+
+    // make a builder run with a given primary suite
+    withPrimarySuite(suite, builder)::
+        if (std.type(builder) == 'array') then [
+                b + (if isBuilder(b) then {environment +: {'MX_PRIMARY_SUITE_PATH': suite}} else {})
+                for b in builder
+            ]
+        else
+            builder + (if (isBuilder(builder)) then {environment +: {'MX_PRIMARY_SUITE_PATH': suite}} else {}),
 }

mx.graalpython/mx_graalpython.py

@@ -908,16 +908,14 @@ def import_python_sources(args):
 # add ci verification util
 #
 # ----------------------------------------------------------------------------------------------------------------------
-def verify_ci(dest_suite, args=None):
+def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet', '.libsonnet')):
     """Verify CI configuration"""
     base_suite = SUITE
-    if not isinstance(dest_suite, mx.SourceSuite) or not isinstance(base_suite, mx.SourceSuite):
-        raise mx.abort("Can not use verify-ci on binary suites: {} and {} need to be source suites".format(
-            SUITE.name, dest_suite.name))
     assert isinstance(base_suite, mx.SourceSuite)
-    for ext in [".libsonnet", ".jsonnet"]:
-        mx.log("CI setup verifying *{} files ... ".format(ext))
-        mx.verify_ci(args, base_suite, dest_suite, common_dirs=['ci_common'], extension=ext)
+
+    ci_files = mx.suite_ci_files(SUITE, common_ci_dir, extension=ext)
+    mx.log("CI setup checking common file(s): \n\t{0}".format('\n\t'.join(map(str, ci_files))))
+    mx.verify_ci(args, base_suite, dest_suite, common_file=ci_files)
 
 
 # ----------------------------------------------------------------------------------------------------------------------

mx.graalpython/suite.py

@@ -5,7 +5,7 @@
     #  METADATA
     #
     # --------------------------------------------------------------------------------------------------------------
-    "mxversion": "5.211.0",
+    "mxversion": "5.219.2",
     "name": "graalpython",
     "versionConflictResolution": "latest",