[GR-70563] Fix sulong job name generation.

PullRequest: graal/22310

Author: rschatz

sulong/ci/ci.jsonnet

@@ -87,7 +87,8 @@ local sc = (import "ci_common/sulong-common.jsonnet");
     $.sulong + sc.post_merge + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,sulongStandalone,interop") + { name: "gate-sulong-standalone-interop-jdk-latest-windows-amd64", timelimit: "1:00:00" },
     $.sulong + tier3 + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,nwcc,llvm") + { name: "gate-sulong-nwcc-llvm-jdk-latest-windows-amd64", timelimit: "30:00" },
     $.sulong + sc.post_merge + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_c") + { name: "gate-sulong-gcc_c-jdk-latest-windows-amd64", timelimit: "45:00" },
-    $.sulong + sc.post_merge + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk-latest-windows-amd64", timelimit: "45:00" },
+    # GR-53974
+    # $.sulong + sc.post_merge + $.common() + sc.labsjdkLatest + sc.windows_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk-latest-windows-amd64", timelimit: "45:00" },
   ],
 
   standalone_builds::
@@ -111,13 +112,13 @@ local sc = (import "ci_common/sulong-common.jsonnet");
     ],
     [
       tier2 + { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-linux-amd64",    timelimit: "1:00:00" },
-      sc.daily + { name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-darwin-amd64",  timelimit: "1:00:00", targets: [] },
-      sc.daily + { name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-windows-amd64",  timelimit: "1:00:00", targets: [] } /* GR-50165 */,
+      sc.daily + { name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-darwin-amd64",  timelimit: "1:00:00" },
+      sc.daily + { name: "daily-sulong-test-ce-standalones-jvm-jdk-latest-windows-amd64",  timelimit: "1:00:00" } /* GR-50165 */,
       tier3 + { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-linux-aarch64",  timelimit: "1:00:00" },
       tier3 + { name: "gate-sulong-test-ce-standalones-jvm-jdk-latest-darwin-aarch64", timelimit: "1:00:00" },
       tier2 + { name: "gate-sulong-test-ce-standalones-native-jdk-latest-linux-amd64",    timelimit: "1:30:00" },
-      sc.daily + { name: "daily-sulong-test-ce-standalones-native-jdk-latest-darwin-amd64",  timelimit: "1:00:00", targets: [] },
-      sc.daily + { name: "daily-sulong-test-ce-standalones-native-jdk-latest-windows-amd64",  timelimit: "1:00:00", targets: [] } /* GR-50165 */,
+      sc.daily + { name: "daily-sulong-test-ce-standalones-native-jdk-latest-darwin-amd64",  timelimit: "1:00:00" },
+      sc.daily + { name: "daily-sulong-test-ce-standalones-native-jdk-latest-windows-amd64",  timelimit: "1:00:00" } /* GR-50165 */,
       tier3 + { name: "gate-sulong-test-ce-standalones-native-jdk-latest-linux-aarch64",  timelimit: "1:00:00" },
       tier3 + { name: "gate-sulong-test-ce-standalones-native-jdk-latest-darwin-aarch64", timelimit: "1:00:00" },
     ]),

sulong/ci/ci_common/sulong-common.jsonnet

@@ -25,6 +25,15 @@ local sulong_deps = common.deps.sulong;
     job:: error "job not set" + $.nameOrEmpty(self),
     bitcode_config:: [],
     sulong_config:: [],
+
+    /**
+     * Normalize targets. Tier targets are semantically gate, independent of the actual frequency.
+     * Reflect this in the job name.
+     */
+    local normalized_targets =
+        local norm(t) = if std.startsWith(t, "tier") then "gate" else t;
+        std.uniq(std.map(norm, self.targets)),
+
     gen_name_componentes::
       assert std.isArray(self.targets) : "targets must be an array" + $.nameOrEmpty(self);
       assert isNonEmptyString(self.suite) : "suite must be a non-empty string" + $.nameOrEmpty(self);
@@ -34,7 +43,7 @@ local sulong_deps = common.deps.sulong;
       assert isNonEmptyString(self.job) : "job must be a non-empty string" + $.nameOrEmpty(self);
       assert std.isArray(self.bitcode_config) : "bitcode_config must be an array" + $.nameOrEmpty(self);
       assert std.isArray(self.sulong_config) : "sulong_config must be an array" + $.nameOrEmpty(self);
-      self.targets + [self.suite] + [self.job] + self.bitcode_config + self.sulong_config + [self.jdk_name] + [self.os] + [self.arch],
+      normalized_targets + [self.suite] + [self.job] + self.bitcode_config + self.sulong_config + [self.jdk_name] + [self.os] + [self.arch],
     gen_name:: std.join("-", self.gen_name_componentes),
   },
 
@@ -86,7 +95,7 @@ local sulong_deps = common.deps.sulong;
     notify_groups:: ["sulong"],
   },
 
-  post_merge:: $.sulong_notifications + common.frequencies.post_merge,
+  post_merge:: $.sulong_notifications + { targets+: ["tier4"] },
   daily:: $.sulong_notifications + common.frequencies.daily,
   weekly:: $.sulong_notifications + common.frequencies.weekly,