[GR-39227] Collect ci files and group them into one ci module on inte…

…lliJinit

PullRequest: graal/12406

ci.jsonnet

@@ -2,37 +2,37 @@
 local graal_common = import 'graal-common.json';
 
 # Compiler
-local compiler = import 'compiler/ci.jsonnet';
+local compiler = import 'compiler/ci/ci.jsonnet';
 
 # GraalWasm
-local wasm = import 'wasm/ci.jsonnet';
+local wasm = import 'wasm/ci/ci.jsonnet';
 
 # Espresso
-local espresso = import 'espresso/ci.jsonnet';
+local espresso = import 'espresso/ci/ci.jsonnet';
 
 # Regex
-local regex = import 'regex/ci.jsonnet';
+local regex = import 'regex/ci/ci.jsonnet';
 
 # SDK
-local sdk = import 'sdk/ci.jsonnet';
+local sdk = import 'sdk/ci/ci.jsonnet';
 
 # SubstrateVM
-local substratevm = import 'substratevm/ci.jsonnet';
+local substratevm = import 'substratevm/ci/ci.jsonnet';
 
 # Sulong
-local sulong = import 'sulong/ci.jsonnet';
+local sulong = import 'sulong/ci/ci.jsonnet';
 
 # Tools
-local tools = import 'tools/ci.jsonnet';
+local tools = import 'tools/ci/ci.jsonnet';
 
 # Truffle
-local truffle = import 'truffle/ci.jsonnet';
+local truffle = import 'truffle/ci/ci.jsonnet';
 
 # JavaDoc
 local javadoc = import "ci_includes/publish-javadoc.jsonnet";
 
 # VM
-local vm = import 'vm/ci_includes/vm.jsonnet';
+local vm = import 'vm/ci/ci_includes/vm.jsonnet';
 
 # Add a guard to `build` that prevents it from running in the gate
 # for a PR that only touches *.md files, the docs, are config files for GitHub

compiler/ci.jsonnet → compiler/ci/ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  local utils = (import '../common-utils.libsonnet'),
+  local utils = (import '../../common-utils.libsonnet'),
   local graal = (import 'ci_includes/gate.jsonnet'),
   local graal_common = (import 'ci_common/gate.jsonnet'),
   local graal_benchmarks = (import 'ci_common/benchmark-builders.jsonnet'),

compiler/ci_common/benchmark-builders.jsonnet → compiler/ci/ci_common/benchmark-builders.jsonnet

@@ -1,6 +1,6 @@
 {
-  local c = (import '../../common.jsonnet'),
-  local bc = (import '../../bench-common.libsonnet'),
+  local c = (import '../../../common.jsonnet'),
+  local bc = (import '../../../bench-common.libsonnet'),
   local cc = (import 'compiler-common.libsonnet'),
   local bench = (import 'benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,

compiler/ci_common/benchmark-suites.libsonnet → compiler/ci/ci_common/benchmark-suites.libsonnet

@@ -1,7 +1,7 @@
 {
-  local common_json = (import '../../common.json'),
-  local c = (import '../../common.jsonnet'),
-  local bc = (import '../../bench-common.libsonnet'),
+  local common_json = (import '../../../common.json'),
+  local c = (import '../../../common.jsonnet'),
+  local bc = (import '../../../bench-common.libsonnet'),
   local cc = (import 'compiler-common.libsonnet'),
 
   local _suite_key(a) = a['suite'],

compiler/ci_common/compiler-common.libsonnet → compiler/ci/ci_common/compiler-common.libsonnet

@@ -1,8 +1,8 @@
 {
-  local common = import "../../common.jsonnet",
-  local bench_common = import "../../bench-common.libsonnet",
-  local config = import "../../repo-configuration.libsonnet",
-  local ci_resources = import "../../ci-resources.libsonnet",
+  local common = import "../../../common.jsonnet",
+  local bench_common = import "../../../bench-common.libsonnet",
+  local config = import "../../../repo-configuration.libsonnet",
+  local ci_resources = import "../../../ci-resources.libsonnet",
 
   enable_profiling:: {
     environment+: {

compiler/ci_common/gate.jsonnet → compiler/ci/ci_common/gate.jsonnet

@@ -1,6 +1,6 @@
 {
-  local c = import '../../common.jsonnet',
-  local config = import '../../repo-configuration.libsonnet',
+  local c = import '../../../common.jsonnet',
+  local config = import '../../../repo-configuration.libsonnet',
   local jvm_config = config.compiler.default_jvm_config,
   local s = self,
   local t(limit) = {timelimit: limit},

compiler/ci_includes/baseline-benchmarks.jsonnet → compiler/ci/ci_includes/baseline-benchmarks.jsonnet

@@ -1,6 +1,6 @@
 {
-  local c = (import '../../common.jsonnet'),
-  local bc = (import '../../bench-common.libsonnet'),
+  local c = (import '../../../common.jsonnet'),
+  local bc = (import '../../../bench-common.libsonnet'),
   local cc = (import '../ci_common/compiler-common.libsonnet'),
   local bench = (import '../ci_common/benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,

compiler/ci_includes/bootstrap_extra.libsonnet → compiler/ci/ci_includes/bootstrap_extra.libsonnet

@@ -1,6 +1,6 @@
 # Bootstrap tasks specific to Graal CE
 {
-  local c = import '../../common.jsonnet',
+  local c = import '../../../common.jsonnet',
   local g = import '../ci_common/gate.jsonnet',
 
   # See definition of `gates` local variable in ../ci_common/gate.jsonnet

compiler/ci_includes/gate.jsonnet → compiler/ci/ci_includes/gate.jsonnet

@@ -1,7 +1,7 @@
 {
-  local common = import '../../common.jsonnet',
-  local utils = import '../../common-utils.libsonnet',
-  local config = import '../../repo-configuration.libsonnet',
+  local common = import '../../../common.jsonnet',
+  local utils = import '../../../common-utils.libsonnet',
+  local config = import '../../../repo-configuration.libsonnet',
 
   local gate_math_stubs_listener = {
     name: 'daily-hotspot-mathstubs-listener-' + utils.prefixed_jdk(self.jdk_version),

compiler/mx.compiler/suite.py

@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "6.5.5",
+  "mxversion" : "6.8.0",
   "name" : "compiler",
   "sourceinprojectwhitelist" : [],
 

espresso/ci.jsonnet → espresso/ci/ci.jsonnet

@@ -1,8 +1,8 @@
 {
-  local graal_common = import '../common.json',
+  local graal_common = import '../../common.json',
   local common = import 'ci_common/common.jsonnet',
   local jdks = graal_common.jdks,
-  local utils = import '../common-utils.libsonnet',
+  local utils = import '../../common-utils.libsonnet',
   local devkits = utils.composable(graal_common.devkits),
 
   suite_name: 'espresso',

espresso/ci_common/common.jsonnet → espresso/ci/ci_common/common.jsonnet

@@ -1,8 +1,8 @@
-local graal_common = import '../../common.jsonnet';
+local graal_common = import '../../../common.jsonnet';
 local base = import '../ci.jsonnet';
-local base_json = import '../../common.json';
+local base_json = import '../../../common.json';
 
-local composable = (import "../../common-utils.libsonnet").composable;
+local composable = (import "../../../common-utils.libsonnet").composable;
 local sulong_deps = composable(base_json.sulong.deps);
 
 local _version_suffix(java_version) = if java_version == 8 then '' else '-java' + java_version;

graal-common.json

@@ -1,6 +1,6 @@
 {
   "README": "This file contains definitions that are useful for the jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "e303ced7d7c107f263090989bd7b8def26de12d2"
-  },
+    "overlay": "16ed90ad892af1c63f833cb5682f63c9f14d463b"
+  }
 }

java-benchmarks/mx.java-benchmarks/suite.py

@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "6.4.0",
+  "mxversion" : "6.8.0",
   "name": "java-benchmarks",
 
   "ignore_suite_commit_info": True,

regex/ci.jsonnet → regex/ci/ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  local common = import '../common.jsonnet',
+  local common = import '../../common.jsonnet',
 
   local regex_common = {
     setup+: [

sdk/ci.jsonnet → sdk/ci/ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  local common = import '../common.jsonnet',
+  local common = import '../../common.jsonnet',
 
   local sdk_gate = {
     name: 'gate-sdk-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,

sdk/mx.sdk/suite.py

@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion" : "6.7.0",
+  "mxversion" : "6.8.0",
   "name" : "sdk",
   "version" : "23.0.0",
   "release" : False,

substratevm/ci.jsonnet → substratevm/ci/ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  local common = import "../common.jsonnet",
+  local common = import "../../common.jsonnet",
 
   local t(limit) = {timelimit: limit},
 

substratevm/mx.substratevm/suite.py

@@ -1,6 +1,6 @@
 # pylint: disable=line-too-long
 suite = {
-    "mxversion" : "6.5.5",
+    "mxversion" : "6.8.0",
     "name": "substratevm",
     "version" : "23.0.0",
     "release" : False,

sulong/ci.jsonnet → sulong/ci/ci.jsonnet

@@ -2,7 +2,7 @@
 # `jsonnetfmt --indent 2 --max-blank-lines 2 --sort-imports --string-style d --comment-style h -i ci.jsonnet`
 local sc = (import "ci_common/sulong-common.jsonnet");
 {
-  local common = import "../common.jsonnet",
+  local common = import "../../common.jsonnet",
 
   local linux_amd64 = common.linux_amd64,
 

sulong/ci_common/sulong-common.jsonnet → sulong/ci/ci_common/sulong-common.jsonnet

@@ -1,8 +1,8 @@
 # File is formatted with
 # `jsonnetfmt --indent 2 --max-blank-lines 2 --sort-imports --string-style d --comment-style h -i ci.jsonnet`
-local common = import "../../common.jsonnet";
-local composable = (import "../../common-utils.libsonnet").composable;
-local sulong_deps = composable((import "../../common.json").sulong.deps);
+local common = import "../../../common.jsonnet";
+local composable = (import "../../../common-utils.libsonnet").composable;
+local sulong_deps = composable((import "../../../common.json").sulong.deps);
 
 {
   local linux_amd64 = common.linux_amd64,

sulong/mx.sulong/suite.py

@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "6.1.14",
+  "mxversion" : "6.8.0",
   "name" : "sulong",
   "versionConflictResolution" : "latest",
 

tools/ci.jsonnet → tools/ci/ci.jsonnet

@@ -1,7 +1,7 @@
 {
-  local common_json = import '../common.json',
-  local common = import '../common.jsonnet',
-  local composable = (import '../common-utils.libsonnet').composable,
+  local common_json = import '../../common.json',
+  local common = import '../../common.jsonnet',
+  local composable = (import '../../common-utils.libsonnet').composable,
   local devkits = composable(common_json.devkits),
 
   local tools_common = composable(common_json.deps.common) + common.mx + {

truffle/ci.jsonnet → truffle/ci/ci.jsonnet

@@ -1,8 +1,8 @@
 {
-  local common_json = import '../common.json',
-  local common = import '../common.jsonnet',
-  local bench_hw = (import '../bench-common.libsonnet').bench_hw,
-  local composable = (import '../common-utils.libsonnet').composable,
+  local common_json = import '../../common.json',
+  local common = import '../../common.jsonnet',
+  local bench_hw = (import '../../bench-common.libsonnet').bench_hw,
+  local composable = (import '../../common-utils.libsonnet').composable,
   local devkits = composable(common_json.devkits),
 
   local darwin_amd64 = common.darwin_amd64,

truffle/mx.truffle/suite.py

@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion" : "6.5.5",
+  "mxversion" : "6.8.0",
   "name" : "truffle",
   "version" : "23.0.0",
   "release" : False,

vm/ci_common/common-bench.jsonnet → vm/ci/ci_common/common-bench.jsonnet

@@ -1,8 +1,8 @@
 local vm = import '../ci_includes/vm.jsonnet';
-local common = import '../../common.jsonnet';
+local common = import '../../../common.jsonnet';
 local vm_common = import '../ci_common/common.jsonnet';
 
-local repo_config = import '../../repo-configuration.libsonnet';
+local repo_config = import '../../../repo-configuration.libsonnet';
 
 {
   vm_bench_common: {
@@ -67,7 +67,7 @@ local repo_config = import '../../repo-configuration.libsonnet';
     bench_cmd:: self.base_cmd + ['benchmark'] + (if (is_gate) then ['--fail-fast'] else []),
     interpreter_bench_cmd:: self.bench_cmd + ['polybench:~r[(compiler/.*)|(warmup/.*)]', '--results-file', self.result_file, '--', '--polybench-vm=graalvm-${VM_ENV}-java${BASE_JDK_SHORT_VERSION}'],
     compiler_bench_cmd:: self.bench_cmd + ['polybench:*[compiler/dispatch.js]', '--results-file', self.result_file, '--', '--polybench-vm=graalvm-${VM_ENV}-java${BASE_JDK_SHORT_VERSION}'],
-    warmup_bench_cmd:: self.bench_cmd + ['--fork-count-file', 'ci_common/benchmark-forks.json',  'polybench:r[warmup/.*]', '--results-file', self.result_file, '--', '--polybench-vm=graalvm-${VM_ENV}-java${BASE_JDK_SHORT_VERSION}'],
+    warmup_bench_cmd:: self.bench_cmd + ['--fork-count-file', 'ci/ci_common/benchmark-forks.json',  'polybench:r[warmup/.*]', '--results-file', self.result_file, '--', '--polybench-vm=graalvm-${VM_ENV}-java${BASE_JDK_SHORT_VERSION}'],
 
     downloads+: {
       WABT_DIR: {name: 'wabt', version: '1.0.12', platformspecific: true},
@@ -85,7 +85,7 @@ local repo_config = import '../../repo-configuration.libsonnet';
     capabilities+: [machine_name],
     run+: [
       self.base_cmd + ['benchmark', 'polybench:'+benchmarks,
-                       '--fork-count-file', 'ci_includes/polybench-hpc.json',
+                       '--fork-count-file', 'ci/ci_includes/polybench-hpc.json',
                        '--results-file', self.result_file,
                        '--machine-name', self.machine_name_prefix + machine_name,
                        '--',
@@ -120,7 +120,7 @@ local repo_config = import '../../repo-configuration.libsonnet';
   },
 
   vm_bench_polybench_linux_context_init: self.vm_bench_polybench_linux_common() + vm.vm_java_17 + {
-    bench_cmd:: super.base_cmd + ['benchmark', '--fork-count-file', 'ci_common/benchmark-forks.json', 'polybench:*[interpreter/pyinit.py,interpreter/jsinit.js,interpreter/rbinit.rb]', '--results-file', self.result_file, '--', '-w', '0', '-i', '0', '--polybench-vm=graalvm-${VM_ENV}-java${BASE_JDK_SHORT_VERSION}'],
+    bench_cmd:: super.base_cmd + ['benchmark', '--fork-count-file', 'ci/ci_common/benchmark-forks.json', 'polybench:*[interpreter/pyinit.py,interpreter/jsinit.js,interpreter/rbinit.rb]', '--results-file', self.result_file, '--', '-w', '0', '-i', '0', '--polybench-vm=graalvm-${VM_ENV}-java${BASE_JDK_SHORT_VERSION}'],
     run+: [
       self.bench_cmd + ['--polybench-vm-config=jvm-standard', '--metric=none'],
       self.upload,

vm/ci_common/common.jsonnet → vm/ci/ci_common/common.jsonnet

@@ -1,8 +1,8 @@
-local composable = (import '../../common-utils.libsonnet').composable;
+local composable = (import '../../../common-utils.libsonnet').composable;
 local vm = import '../ci_includes/vm.jsonnet';
-local graal_common = import '../../common.jsonnet';
-local repo_config = import '../../repo-configuration.libsonnet';
-local common_json = composable(import '../../common.json');
+local graal_common = import '../../../common.jsonnet';
+local repo_config = import '../../../repo-configuration.libsonnet';
+local common_json = composable(import '../../../common.json');
 local devkits = common_json.devkits;
 
 {

vm/ci_common/libgraal.jsonnet → vm/ci/ci_common/libgraal.jsonnet

@@ -1,12 +1,12 @@
-local composable = (import '../../common-utils.libsonnet').composable;
+local composable = (import '../../../common-utils.libsonnet').composable;
 local vm = import '../ci_includes/vm.jsonnet';
-local graal_common = import '../../common.jsonnet';
-local repo_config = import '../../repo-configuration.libsonnet';
-local common_json = composable(import '../../common.json');
+local graal_common = import '../../../common.jsonnet';
+local repo_config = import '../../../repo-configuration.libsonnet';
+local common_json = composable(import '../../../common.json');
 local devkits = common_json.devkits;
 local c = import 'common.jsonnet';
 local g = vm.compiler_gate;
-local utils = import '../../common-utils.libsonnet';
+local utils = import '../../../common-utils.libsonnet';
 
 {
   local underscore(s) = std.strReplace(s, "-", "_"),

vm/ci_includes/vm.jsonnet → vm/ci/ci_includes/vm.jsonnet

@@ -1,11 +1,11 @@
-local composable = (import '../../common-utils.libsonnet').composable;
+local composable = (import '../../../common-utils.libsonnet').composable;
 local vm_common = import '../ci_common/common.jsonnet';
 local vm_common_bench = import '../ci_common/common-bench.jsonnet';
 local vm = import 'vm.jsonnet';
 local vm_bench = import 'vm-bench.jsonnet';
 local vm_native = import 'vm-native.jsonnet';
-local graal_common = import '../../common.jsonnet';
-local common_json = composable(import '../../common.json');
+local graal_common = import '../../../common.jsonnet';
+local common_json = composable(import '../../../common.json');
 local jdks = common_json.jdks;
 
 {
@@ -282,5 +282,5 @@ local jdks = common_json.jdks;
 
   builds: [vm_common.verify_name(b1) for b1 in vm_common.builds + vm_common_bench.builds + vm_bench.builds + vm_native.builds + [{'defined_in': std.thisFile} + b2  for b2 in builds]],
 
-  compiler_gate:: (import '../../compiler/ci_common/gate.jsonnet')
+  compiler_gate:: (import '../../../compiler/ci/ci_common/gate.jsonnet')
 }

vm/mx.vm/suite.py

@@ -1,7 +1,7 @@
 suite = {
     "name": "vm",
     "version" : "23.0.0",
-    "mxversion" : "6.5.5",
+    "mxversion" : "6.8.0",
     "release" : False,
     "groupId" : "org.graalvm",
 

wasm/ci_common/common.jsonnet → wasm/ci/ci_common/common.jsonnet

@@ -5,10 +5,10 @@ local wasm_suite_root = root_ci.wasm_suite_root;
 local graal_suite_root = root_ci.graal_suite_root;
 
 {
-  local mx = (import "../../common.json").mx_version,
-  local common = (import "../../common.jsonnet"),
-  local common_json = (import "../../common.json"),
-  local utils = (import "../../common-utils.libsonnet"),
+  local mx = (import "../../../common.json").mx_version,
+  local common = (import "../../../common.jsonnet"),
+  local common_json = (import "../../../common.json"),
+  local utils = (import "../../../common-utils.libsonnet"),
 
   devkits: utils.composable(common_json.devkits),
 

wasm/mx.wasm/suite.py

@@ -39,7 +39,7 @@
 # SOFTWARE.
 #
 suite = {
-  "mxversion" : "6.1.14",
+  "mxversion" : "6.8.0",
   "name" : "wasm",
   "groupId" : "org.graalvm.wasm",
   "version" : "23.0.0",