[GR-68451] Remove default timelimit in graal/ci/ci_common/common.jsonnet

PullRequest: graal/21757

Author: eregon

ci/ci_common/common.jsonnet

@@ -128,7 +128,6 @@ common + common.frequencies + {
       "*.bgv",
       "*/graal_dumps/*/*",
     ],
-    timelimit: "30:00",
   },
   local linux_deps_extras = {
     packages+: {

ci/ci_common/run-spec-tools.libsonnet

@@ -54,30 +54,9 @@ local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;
     local table = [ ["name", "variant", task_details_title] + platform_titles] + cols;
     table
   ,
-  // Removes the 'timelimit' property from an object.
-  // Usually, this is used to remove hard-coded (default) timelimits defined in `ci/ci_common/common.jsonnet`.
-  // These definitions assume that the os/arch definition comes first and will be refined later.
-  // With run-spec, however, this is not true in general because the os/arch is only fixed later
-  // in the pipeline. Thus, hard-coded timelimits would override any previous settings. To resolve
-  // this, we delete the default value altogether and explicitly set the timelimits for all jobs.
-  //
-  // Implementation note: we cannot set the value to `null` and use `std.prune` because that deletes hidden fields.
-  delete_timelimit(b)::
-    local public_fields = std.objectFields(b);
-    std.foldl(function(acc, k) acc +
-      local value = b[k];
-      if std.member(public_fields, k) then
-        if std.type(value) == "string" then
-          { [k]: value }
-        else
-          { [k]+: value }
-      else
-        if std.type(value) == "string" then
-          { [k]:: value }
-        else
-          { [k]+:: value }
-      ,
-      [k for k in std.objectFieldsAll(b) if k != "timelimit"],
-      {}
-    ),
+  // Check there is no 'timelimit' property on an object,
+  // so that it is safe to add the timelimit later and ordering won't matter.
+  check_no_timelimit(b)::
+    assert !std.objectHasAll(b, "timelimit") : "b";
+    b,
 }

substratevm/ci/ci.jsonnet

@@ -6,6 +6,7 @@
   local tools      = import "ci_common/tools.libsonnet",
   local sg         = import "ci_common/svm-gate.libsonnet",
   local run_spec   = import "../../ci/ci_common/run-spec.libsonnet",
+  local check_no_timelimit = (import '../../ci/ci_common/run-spec-tools.libsonnet').check_no_timelimit,
   local galahad    = import "../../ci/ci_common/galahad-common.libsonnet",
   local exclude    = run_spec.exclude,
 
@@ -85,7 +86,7 @@
   local os_arch_jdk_mixin = task_spec(run_spec.evaluate_late({
     // this starts with _ on purpose so that it will be evaluated first
     "_os_arch_jdk": function(b)
-      tools.delete_timelimit(jdk_name_to_dict[b.jdk] + default_os_arch(b)[b.os][b.arch])
+      check_no_timelimit(jdk_name_to_dict[b.jdk] + default_os_arch(b)[b.os][b.arch])
   })),
 
   local all_jobs = {

substratevm/ci/ci_common/tools.libsonnet

@@ -56,26 +56,6 @@
   // std.get is not available in all versions
   std_get::(import '../../common-utils.libsonnet').std_get,
   //
-  local delete_timelimit(b) =
-    local public_fields = std.objectFields(b);
-    std.foldl(function(acc, k) acc +
-      local value = b[k];
-      if std.member(public_fields, k) then
-        if std.type(value) == "string" then
-          { [k]: value }
-        else
-          { [k]+: value }
-      else
-        if std.type(value) == "string" then
-          { [k]:: value }
-        else
-          { [k]+:: value }
-      ,
-      [k for k in std.objectFieldsAll(b) if k != "timelimit"],
-      {}
-    ),
-  delete_timelimit::delete_timelimit,
-  //
   local _make_visible(o, inc_hidden=true) =
     local objectFields = if inc_hidden then std.objectFieldsAll else std.objectFields;
     if std.type(o) == "array" then

web-image/ci/ci_common/wi-run-spec.jsonnet

@@ -2,7 +2,7 @@ local ci_common = import '../../../ci/ci_common/common.jsonnet';
 local r = import '../../../ci/ci_common/run-spec.libsonnet';
 local common = import 'common.jsonnet';
 
-local delete_timelimit = (import '../../../ci/ci_common/run-spec-tools.libsonnet').delete_timelimit;
+local check_no_timelimit = (import '../../../ci/ci_common/run-spec-tools.libsonnet').check_no_timelimit;
 
 // Supported JDKs for jobs
 local jdk_name_to_dict = {
@@ -12,7 +12,7 @@ local jdk_name_to_dict = {
 local os_arch_jdk_mixin(mapping) = r.task_spec(r.evaluate_late({
   // this starts with _ on purpose so that it will be evaluated first
   _os_arch_jdk: function(b)
-    delete_timelimit(jdk_name_to_dict[b.jdk] + mapping(b)[b.os][b.arch]),
+    check_no_timelimit(jdk_name_to_dict[b.jdk] + mapping(b)[b.os][b.arch]),
 }));
 
 {