ci: add more utils functions

Author: cosminbasca

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.isArray(builder)) 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,18 @@ def import_python_sources(args):
 # add ci verification util
 #
 # ----------------------------------------------------------------------------------------------------------------------
-def verify_ci(dest_suite, args=None):
+def verify_ci(dest_suite, common_dirs=None, args=None):
     """Verify CI configuration"""
+    if common_dirs is None:
+        common_dirs = ['ci_common']
     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)
+        mx.verify_ci(args, base_suite, dest_suite, common_dirs=common_dirs, extension=ext)
 
 
 # ----------------------------------------------------------------------------------------------------------------------