[GR-65236] Move Web Image jobs to tiers

PullRequest: graal/21543

Author: patrick96

ci.jsonnet

@@ -55,6 +55,7 @@ local libgraal(builds, include=true) = [b for b in builds if (std.findSubstr("li
     tier1: "gate",
     tier2: "gate",
     tier3: "gate",
+    tier4: "post-merge",
   },
   builds: [common.add_excludes_guard(common.with_style_component(b)) for b in (
     common.with_components(compiler.builds + libgraal(vm.builds), ["compiler"]) +

web-image/ci/ci.jsonnet

@@ -8,17 +8,19 @@ local mxgate(tags) = r.mxgate(tags, suite='web-image');
 local platforms = r.platforms;
 local t = r.t;
 
-local gate = r.gate;
+local tier1 = r.tier1;
+local tier2 = r.tier2;
 local weekly = r.weekly;
 
 {
   // THE TASK CONFIGURATION
   task_dict:: {
+    // TODO GR-67831 Split into separate style and fullbuild jobs
     'style-fullbuild': mxgate('style,fullbuild,webimagehelp,webimageoptions') + t('30:00') + r.eclipse + r.jdt + r.spotbugs + r.prettier + platforms({
-      'linux:amd64:jdk-latest': gate,
+      'linux:amd64:jdk-latest': tier1,
     }),
     'unittest': mxgate('webimagebuild,webimageunittest') + t('30:00') + r.node22 + platforms({
-      'linux:amd64:jdk-latest': gate,
+      'linux:amd64:jdk-latest': tier2,
     }),
   },
   processed_tasks:: r.process(self.task_dict),

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

@@ -20,13 +20,17 @@ local os_arch_jdk_mixin(mapping) = r.task_spec(r.evaluate_late({
   // These should always be used to set/add job targets, otherwise the 'target'
   // key is not set.
   target(t): r.task_spec({ target: t, targets+: [t] }),
-  gate: self.target('gate'),
+  tier1: self.target('tier1'),
+  tier2: self.target('tier2'),
+  tier3: self.target('tier3'),
+  tier4: self.target('tier4'),
   daily: self.target('daily'),
   weekly: self.target('weekly'),
   post_merge: self.target('post-merge'),
   // opt-post-merge jobs should have an associated tag to group the jobs
   opt_post_merge(tag): self.target('opt-post-merge') + r.task_spec({ tags+: { opt_post_merge+: [tag] } }),
 
+  capabilities(capabilities): r.task_spec({ capabilities+: capabilities }),
 
   docker_ol8: {
     docker: {
@@ -75,6 +79,17 @@ local os_arch_jdk_mixin(mapping) = r.task_spec(r.evaluate_late({
   evaluate_late: r.evaluate_late,
   exclude: r.exclude,
 
+  // Tiered jobs should be treated as gate jobs. Moving a job to the tier system
+  // or moving it between tiers should not affect anything else about the job
+  // definition
+  is_gate_target(target): target == 'gate' || std.startsWith(target, 'tier'),
+
+  target_to_prefix(target):
+    if $.is_gate_target(target) then
+      'gate'
+    else
+      target,
+
   // Base Task specification
   job(suite, suite_short=suite, os_arch_mapping=$.default_os_arch): os_arch_jdk_mixin(os_arch_mapping) + r.task_spec(common.catch_test_failures + common.svm {
     // These 4 are provided by the run-spec library
@@ -94,7 +109,7 @@ local os_arch_jdk_mixin(mapping) = r.task_spec(r.evaluate_late({
     setup+: [
       ['cd', './' + suite],
     ],
-    name: std.join('-', [self.target, self.suite_short, self.task_name] + self.variations + [self.os, self.arch, self.jdk]),
+    name: std.join('-', [$.target_to_prefix(self.target), self.suite_short, self.task_name] + self.variations + [self.os, self.arch, self.jdk]),
   }),
 
   // Get all web image flags in the given job