[GR-24662] More jsonnet migration.

PullRequest: graal/9814

bench-common.libsonnet

@@ -49,6 +49,13 @@
       default_numa_node:: 0,
       num_threads:: 72
     },
+    x82:: common.linux + common.amd64 + self._bench_machine + {
+      machine_name:: "x82",
+      capabilities+: ["no_frequency_scaling", "tmpfs25g"],
+      numa_nodes:: [0, 1],
+      default_numa_node:: 0,
+      num_threads:: 96
+    },
     xgene3:: common.linux + common.aarch64 + self._bench_machine + {
       machine_name:: "xgene3",
       capabilities+: [],

ci.hocon

@@ -54,9 +54,6 @@ include "compiler/ci_includes/bench-aarch64-c2.hocon"
 # ------------------ SVM ----------------------
 include "substratevm/ci_includes/gate.hocon"
 
-# Publish Javadoc
-include "ci_includes/publish-javadoc.hocon"
-
 # ------------------- VM ----------------------
 include "vm/ci_common/common.hocon"
 include "vm/ci_common/common-bench.hocon"

ci.jsonnet

@@ -10,6 +10,9 @@ local espresso = import 'espresso/ci.jsonnet';
 # Sulong
 local sulong = import 'sulong/ci.jsonnet';
 
+# JavaDoc
+local javadoc = import "ci_includes/publish-javadoc.jsonnet";
+
 # Add a guard to `build` that prevents it from running in the gate
 # for a PR that only touches *.md flles.
 local add_markdown_guard(build) = build + {
@@ -23,5 +26,11 @@ local add_markdown_guard(build) = build + {
   _checkCommon: (import 'common.jsonnet'),
   ci_resources:: (import 'ci-resources.libsonnet'),
   specVersion: "2",
-  builds: [add_markdown_guard(b) for b in (compiler.builds + wasm.builds + espresso.builds + sulong.builds)]
+  builds: [add_markdown_guard(b) for b in (
+    compiler.builds +
+    wasm.builds +
+    espresso.builds +
+    sulong.builds +
+    javadoc.builds
+  )]
 }

ci_includes/publish-javadoc.jsonnet

@@ -0,0 +1,52 @@
+{
+  local common = import '../common.jsonnet',
+  local utils = import '../common-utils.libsonnet',
+  local linux_amd64 = common["linux-amd64"],
+
+  local javadoc_publisher = {
+    name: 'graal-publish-javadoc-' + utils.prefixed_jdk(self.jdk_version),
+    run+: [
+      ["cd", "./sdk"],
+      ["mx", "build"],
+      ["mx", "javadoc"],
+      ["zip", "-r", "javadoc.zip", "javadoc"],
+      ["cd", "../truffle"],
+      ["mx", "build"],
+      ["mx", "javadoc"],
+      ["zip", "-r", "javadoc.zip", "javadoc"],
+      ["cd", "../tools"],
+      ["mx", "build"],
+      ["mx", "javadoc"],
+      ["zip", "-r", "javadoc.zip", "javadoc"],
+      ["cd", "../compiler"],
+      ["mx", "build"],
+      ["mx", "javadoc", "--projects", "org.graalvm.graphio"],
+      ["cd", "src/org.graalvm.graphio/"],
+      ["zip", "-r", "../../graphio-javadoc.zip", "javadoc"],
+      ["cd", "../../.."],
+      ["set-export", "GRAAL_REPO", ["pwd"]],
+      ["cd", ".."],
+      ["git", "clone", ["mx", "urlrewrite", "https://github.com/graalvm/graalvm-website.git"]],
+      ["cd", "graalvm-website"],
+      ["rm", "-rf", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
+      ["git", "status" ],
+      ["unzip", "-o", "-d", "sdk", "$GRAAL_REPO/sdk/javadoc.zip"],
+      ["unzip", "-o", "-d", "truffle", "$GRAAL_REPO/truffle/javadoc.zip"],
+      ["unzip", "-o", "-d", "tools", "$GRAAL_REPO/tools/javadoc.zip"],
+      ["unzip", "-o", "-d", "graphio", "$GRAAL_REPO/compiler/graphio-javadoc.zip"],
+      ["git", "add", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
+      ["git", "config", "user.name", "Javadoc Publisher"],
+      ["git", "config", "user.email", "[email protected]"],
+      ["git", "diff", "--staged", "--quiet", "||", "git", "commit", "-m", ["echo", "Javadoc as of", ["date", "+%Y/%m/%d"]]],
+      ["git", "push", "origin", "HEAD"]
+    ],
+     notify_groups:: ["javadoc"],
+     timelimit : "30:00"
+  },
+
+  local all_builds = [
+    common.post_merge + linux_amd64 + common.oraclejdk8 + javadoc_publisher,
+  ],
+  // adds a "defined_in" field to all builds mentioning the location of this current file
+  builds:: [{ defined_in: std.thisFile } + b for b in all_builds]
+}

compiler/ci_common/benchmark-suites.libsonnet

@@ -42,7 +42,7 @@
     ],
     timelimit: "45:00",
     forks_batches:: 1,
-    forks_timelimit:: "02:45:00",
+    forks_timelimit:: "04:00:00",
     min_jdk_version:: 8,
     max_jdk_version:: null
   },

compiler/ci_includes/gate.jsonnet

@@ -1,10 +1,11 @@
 {
-  local common = (import '../../common.jsonnet'),
+  local common = import '../../common.jsonnet',
+  local utils = import '../../common-utils.libsonnet',
   local config = import '../../repo-configuration.libsonnet',
   local linux_amd64 = common["linux-amd64"],
 
-  local gateMathStubsListener = common.daily + linux_amd64 + common.oraclejdk8 + {
-    name: 'daily-hotspot-mathstubs-listener',
+  local gate_math_stubs_listener = {
+    name: 'daily-hotspot-mathstubs-listener-' + utils.prefixed_jdk(self.jdk_version),
     environment+: {
       "HOTSPOT_PORT_SYNC_CHECK" : "true"
     },
@@ -14,12 +15,11 @@
     run+: [
       ["mx", "build"]
     ],
-    notify_emails: [
-      "[email protected]"
-    ],
+    timelimit : "10:00",
+    notify_groups:: ["compiler_stubs"],
   },
 
   builds: [
-    gateMathStubsListener,
+    common.daily + linux_amd64 + common.oraclejdk8 + gate_math_stubs_listener,
   ]
 }

graal-common.json

@@ -1,7 +1,7 @@
 {
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "b6feed939cb56920c218bad4cd64e2f475eaacf1"
+    "overlay": "32cfe3bc1cae2b79569d17017dc83ba8d494a4c9"
   },
   "mx_version" : "HEAD"
 }