[GR-39227] Recognize Top Level Ci

dnestoro · dnestoro · commit c806e99f6d68 · 2022-11-27T23:03:12.000Z
PullRequest: graal/13132
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1,5 +1,5 @@
 # Common
-local common = import 'common.jsonnet';
+local common = import 'ci/ci_common/common.jsonnet';
 local graal_common = import 'graal-common.json';
 
 # Compiler
@@ -35,12 +35,12 @@ local javadoc = import "ci_includes/publish-javadoc.jsonnet";
 # VM
 local vm = import 'vm/ci/ci_includes/vm.jsonnet';
 
-local verify_ci = (import 'ci-check.libsonnet').verify_ci;
+local verify_ci = (import 'ci/ci_common/ci-check.libsonnet').verify_ci;
 
 {
   # Ensure that entries in common.jsonnet can be resolved.
-  _checkCommon: (import 'common.jsonnet'),
-  ci_resources:: (import 'ci-resources.libsonnet'),
+  _checkCommon: (import 'ci/ci_common/common.jsonnet'),
+  ci_resources:: (import 'ci/ci_common/ci-resources.libsonnet'),
   overlay: graal_common.ci.overlay,
   specVersion: "3",
   builds: [common.add_excludes_guard(b) for b in (
diff --git a/ci/ci_common/bench-common.libsonnet b/ci/ci_common/bench-common.libsonnet
@@ -1,5 +1,5 @@
 {
-  local common = import "common.jsonnet",
+  local common = import "ci/ci_common/common.jsonnet",
   local utils = import "common-utils.libsonnet",
 
   # benchmark job base with automatically generated name
diff --git a/ci/ci_common/ci-check.libsonnet b/ci/ci_common/ci-check.libsonnet
diff --git a/ci/ci_common/ci-resources.libsonnet b/ci/ci_common/ci-resources.libsonnet
diff --git a/ci/ci_common/common-utils.libsonnet b/ci/ci_common/common-utils.libsonnet
diff --git a/ci/ci_common/common.jsonnet b/ci/ci_common/common.jsonnet
@@ -1,8 +1,8 @@
 local composable = (import "common-utils.libsonnet").composable;
 
-local mx_version = (import "common.json").mx_version;
-local common_json = composable(import "common.json");
-local repo_config = import 'repo-configuration.libsonnet';
+local mx_version = (import "../../common.json").mx_version;
+local common_json = composable(import "../../common.json");
+local repo_config = import '../repo-configuration.libsonnet';
 local jdks = common_json.jdks;
 local deps = common_json.deps;
 local downloads = common_json.downloads;
@@ -51,7 +51,7 @@ local add_jdk_version(name) =
 
   build_base:: {
     // holds location of CI resources that can easily be overwritten in an overlay
-    ci_resources:: (import "ci-resources.libsonnet"),
+    ci_resources:: (import "ci/ci_common/ci-resources.libsonnet"),
   },
 
   // Job frequencies
diff --git a/ci/ci_common/run-spec-impl.libsonnet b/ci/ci_common/run-spec-impl.libsonnet
@@ -3,7 +3,7 @@ local supported_oss_names = r.supported_oss_names;
 local supported_archs_names = r.supported_archs_names;
 local supported_jdks_names = r.supported_jdks_names;
 
-local std_get = (import "../../common-utils.libsonnet").std_get;
+local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;
 {
   //
   local CONFIG_KEY = "<build-config>",
diff --git a/ci/ci_common/run-spec-tools.libsonnet b/ci/ci_common/run-spec-tools.libsonnet
@@ -3,7 +3,7 @@ local _impl = import "run-spec-impl.libsonnet";
 local supported_oss_names = r.supported_oss_names;
 local supported_archs_names = r.supported_archs_names;
 local supported_jdks_names = r.supported_jdks_names;
-local std_get = (import "../../common-utils.libsonnet").std_get;
+local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;
 {
   local map_os_arch_jdk(fn) =
     [fn(os, arch, jdk)
diff --git a/ci/repo-configuration.libsonnet b/ci/repo-configuration.libsonnet
diff --git a/ci_includes/publish-javadoc.jsonnet b/ci_includes/publish-javadoc.jsonnet
@@ -1,6 +1,6 @@
 {
-  local common = import '../common.jsonnet',
-  local utils = import '../common-utils.libsonnet',
+  local common = import '../ci/ci_common/common.jsonnet',
+  local utils = import '../ci/ci_common/common-utils.libsonnet',
   local linux_amd64 = common.linux_amd64,
 
   local javadoc_publisher = {
diff --git a/compiler/ci/ci.jsonnet b/compiler/ci/ci.jsonnet
@@ -1,5 +1,5 @@
 {
-  local utils = (import '../../common-utils.libsonnet'),
+  local utils = (import '../../ci/ci_common/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'),
diff --git a/compiler/ci/ci_common/benchmark-builders.jsonnet b/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 '../../../ci/ci_common/common.jsonnet'),
+  local bc = (import '../../../ci/ci_common/bench-common.libsonnet'),
   local cc = (import 'compiler-common.libsonnet'),
   local bench = (import 'benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,
diff --git a/compiler/ci/ci_common/benchmark-suites.libsonnet b/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 c = (import '../../../ci/ci_common/common.jsonnet'),
+  local bc = (import '../../../ci/ci_common/bench-common.libsonnet'),
   local cc = (import 'compiler-common.libsonnet'),
 
   local _suite_key(a) = a['suite'],
diff --git a/compiler/ci/ci_common/compiler-common.libsonnet b/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 "../../../ci/ci_common/common.jsonnet",
+  local bench_common = import "../../../ci/ci_common/bench-common.libsonnet",
+  local config = import "../../../ci/repo-configuration.libsonnet",
+  local ci_resources = import "../../../ci/ci_common/ci-resources.libsonnet",
 
   enable_profiling:: {
     environment+: {
diff --git a/compiler/ci/ci_common/gate.jsonnet b/compiler/ci/ci_common/gate.jsonnet
@@ -1,6 +1,6 @@
 {
-  local c = import '../../../common.jsonnet',
-  local config = import '../../../repo-configuration.libsonnet',
+  local c = import '../../../ci/ci_common/common.jsonnet',
+  local config = import '../../../ci/repo-configuration.libsonnet',
   local jvm_config = config.compiler.default_jvm_config,
   local s = self,
   local t(limit) = {timelimit: limit},
diff --git a/compiler/ci/ci_includes/baseline-benchmarks.jsonnet b/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 '../../../ci/ci_common/common.jsonnet'),
+  local bc = (import '../../../ci/ci_common/bench-common.libsonnet'),
   local cc = (import '../ci_common/compiler-common.libsonnet'),
   local bench = (import '../ci_common/benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,
diff --git a/compiler/ci/ci_includes/bootstrap_extra.libsonnet b/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 '../../../ci/ci_common/common.jsonnet',
   local g = import '../ci_common/gate.jsonnet',
 
   # See definition of `gates` local variable in ../ci_common/gate.jsonnet
diff --git a/compiler/ci/ci_includes/gate.jsonnet b/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 '../../../ci/ci_common/common.jsonnet',
+  local utils = import '../../../ci/ci_common/common-utils.libsonnet',
+  local config = import '../../../ci/repo-configuration.libsonnet',
 
   local gate_math_stubs_listener = {
     name: 'daily-hotspot-mathstubs-listener-' + utils.prefixed_jdk(self.jdk_version),
diff --git a/espresso/ci/ci.jsonnet b/espresso/ci/ci.jsonnet
@@ -2,7 +2,7 @@
   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 '../../ci/ci_common/common-utils.libsonnet',
   local devkits = utils.composable(graal_common.devkits),
 
   suite_name: 'espresso',
diff --git a/espresso/ci/ci_common/common.jsonnet b/espresso/ci/ci_common/common.jsonnet
@@ -1,8 +1,8 @@
-local graal_common = import '../../../common.jsonnet';
+local graal_common = import '../../../ci/ci_common/common.jsonnet';
 local base = import '../ci.jsonnet';
 local base_json = import '../../../common.json';
 
-local composable = (import "../../../common-utils.libsonnet").composable;
+local composable = (import "../../../ci/ci_common/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;
diff --git a/graal-common.json b/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": "396734809f34f21030aa1f6d706b648969bc9a35"
+    "overlay": "a6a73c304ee9682c0693d7875426725e1b5f0da0"
   }
 }
diff --git a/regex/ci/ci.jsonnet b/regex/ci/ci.jsonnet
@@ -1,5 +1,5 @@
 {
-  local common = import '../../common.jsonnet',
+  local common = import '../../ci/ci_common/common.jsonnet',
 
   local regex_common = {
     setup+: [
diff --git a/sdk/ci/ci.jsonnet b/sdk/ci/ci.jsonnet
@@ -1,6 +1,6 @@
 {
-  local common = import '../../common.jsonnet',
-  local utils = import '../../common-utils.libsonnet',
+  local common = import '../../ci/ci_common/common.jsonnet',
+  local utils = import '../../ci/ci_common/common-utils.libsonnet',
 
   local sdk_gate = {
     name: 'gate-sdk-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
diff --git a/substratevm/ci/ci.jsonnet b/substratevm/ci/ci.jsonnet
@@ -1,5 +1,5 @@
 {
-  local common = import "../../common.jsonnet",
+  local common = import "../../ci/ci_common/common.jsonnet",
   local tools      = import "ci_common/tools.libsonnet",
   local sg         = import "ci_common/svm-gate.libsonnet",
   local inc        = import "ci_common/include.libsonnet",
diff --git a/substratevm/ci/ci_common/svm-gate.libsonnet b/substratevm/ci/ci_common/svm-gate.libsonnet
@@ -1,5 +1,5 @@
 {
-  local common     = import "../../../common.jsonnet",
+  local common     = import "../../../ci/ci_common/common.jsonnet",
   local tools      = import "tools.libsonnet",
   local run_spec   = import "../../../ci/ci_common/run-spec.libsonnet",
 
diff --git a/sulong/ci/ci.jsonnet b/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 "../../ci/ci_common/common.jsonnet",
 
   local linux_amd64 = common.linux_amd64,
 
diff --git a/sulong/ci/ci_common/sulong-common.jsonnet b/sulong/ci/ci_common/sulong-common.jsonnet
@@ -1,7 +1,7 @@
 # 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 common = import "../../../ci/ci_common/common.jsonnet";
+local composable = (import "../../../ci/ci_common/common-utils.libsonnet").composable;
 local sulong_deps = composable((import "../../../common.json").sulong.deps);
 
 {
diff --git a/tools/ci/ci.jsonnet b/tools/ci/ci.jsonnet
@@ -1,8 +1,8 @@
 {
   local common_json = import '../../common.json',
-  local common = import '../../common.jsonnet',
-  local composable = (import '../../common-utils.libsonnet').composable,
-  local top_level_ci = (import '../../common-utils.libsonnet').top_level_ci,
+  local common = import '../../ci/ci_common/common.jsonnet',
+  local composable = (import '../../ci/ci_common/common-utils.libsonnet').composable,
+  local top_level_ci = (import '../../ci/ci_common/common-utils.libsonnet').top_level_ci,
   local devkits = composable(common_json.devkits),
 
   local tools_common = composable(common_json.deps.common) + common.mx + {
diff --git a/truffle/ci/ci.jsonnet b/truffle/ci/ci.jsonnet
@@ -1,9 +1,9 @@
 {
   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 top_level_ci = (import '../../common-utils.libsonnet').top_level_ci,
+  local common = import '../../ci/ci_common/common.jsonnet',
+  local bench_hw = (import '../../ci/ci_common/bench-common.libsonnet').bench_hw,
+  local composable = (import '../../ci/ci_common/common-utils.libsonnet').composable,
+  local top_level_ci = (import '../../ci/ci_common/common-utils.libsonnet').top_level_ci,
   local devkits = composable(common_json.devkits),
 
   local darwin_amd64 = common.darwin_amd64,
diff --git a/vm/ci/ci_common/common-bench.jsonnet b/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 '../../../ci/ci_common/common.jsonnet';
 local vm_common = import '../ci_common/common.jsonnet';
 
-local repo_config = import '../../../repo-configuration.libsonnet';
+local repo_config = import '../../../ci/repo-configuration.libsonnet';
 
 {
   vm_bench_common: {
diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet
@@ -1,6 +1,6 @@
-local composable = (import '../../../common-utils.libsonnet').composable;
+local composable = (import '../../../ci/ci_common/common-utils.libsonnet').composable;
 local vm = import '../ci_includes/vm.jsonnet';
-local graal_common = import '../../../common.jsonnet';
+local graal_common = import '../../../ci/ci_common/common.jsonnet';
 local repo_config = import '../../../repo-configuration.libsonnet';
 local common_json = composable(import '../../../common.json');
 local devkits = common_json.devkits;
diff --git a/vm/ci/ci_common/libgraal.jsonnet b/vm/ci/ci_common/libgraal.jsonnet
@@ -1,12 +1,12 @@
-local composable = (import '../../../common-utils.libsonnet').composable;
+local composable = (import '../../../ci/ci_common/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 graal_common = import '../../../ci/ci_common/common.jsonnet';
+local repo_config = import '../../../ci/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 '../../../ci/ci_common/common-utils.libsonnet';
 
 {
   local underscore(s) = std.strReplace(s, "-", "_"),
diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet
@@ -1,10 +1,10 @@
-local composable = (import '../../../common-utils.libsonnet').composable;
+local composable = (import '../../../ci/ci_common/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 graal_common = import '../../../ci/ci_common/common.jsonnet';
 local common_json = composable(import '../../../common.json');
 local jdks = common_json.jdks;
 
diff --git a/wasm/ci/ci_common/common.jsonnet b/wasm/ci/ci_common/common.jsonnet
@@ -6,9 +6,9 @@ local graal_suite_root = root_ci.graal_suite_root;
 
 {
   local mx = (import "../../../common.json").mx_version,
-  local common = (import "../../../common.jsonnet"),
+  local common = (import "../../../ci/ci_common/common.jsonnet"),
   local common_json = (import "../../../common.json"),
-  local utils = (import "../../../common-utils.libsonnet"),
+  local utils = (import "../../../ci/ci_common/common-utils.libsonnet"),
 
   devkits: utils.composable(common_json.devkits),
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- local common = import "common.jsonnet",`
	`2`	`+ local common = import "ci/ci_common/common.jsonnet",`
`3`	`3`	`local utils = import "common-utils.libsonnet",`
`4`	`4`
`5`	`5`	`# benchmark job base with automatically generated name`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ local supported_oss_names = r.supported_oss_names;`
`3`	`3`	`local supported_archs_names = r.supported_archs_names;`
`4`	`4`	`local supported_jdks_names = r.supported_jdks_names;`
`5`	`5`
`6`		`-local std_get = (import "../../common-utils.libsonnet").std_get;`
	`6`	`+local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;`
`7`	`7`	`{`
`8`	`8`	`//`
`9`	`9`	`local CONFIG_KEY = "<build-config>",`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ local _impl = import "run-spec-impl.libsonnet";`
`3`	`3`	`local supported_oss_names = r.supported_oss_names;`
`4`	`4`	`local supported_archs_names = r.supported_archs_names;`
`5`	`5`	`local supported_jdks_names = r.supported_jdks_names;`
`6`		`-local std_get = (import "../../common-utils.libsonnet").std_get;`
	`6`	`+local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;`
`7`	`7`	`{`
`8`	`8`	`local map_os_arch_jdk(fn) =`
`9`	`9`	`[fn(os, arch, jdk)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- local common = import '../common.jsonnet',`
`3`		`- local utils = import '../common-utils.libsonnet',`
	`2`	`+ local common = import '../ci/ci_common/common.jsonnet',`
	`3`	`+ local utils = import '../ci/ci_common/common-utils.libsonnet',`
`4`	`4`	`local linux_amd64 = common.linux_amd64,`
`5`	`5`
`6`	`6`	`local javadoc_publisher = {`