reduce galahad gate to bare minimum

graalvm · May 31, 2024 · 268aa8d · 268aa8d
1 parent 90def08
commit 268aa8d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/compiler/ci/ci_common/gate.jsonnet b/compiler/ci/ci_common/gate.jsonnet
@@ -396,7 +396,7 @@
   ],
 
   # Builds run on all platforms (platform = JDK + OS + ARCH)
-  local all_platforms_builds = [self.make_build(jdk, os_arch, task).build
+  local all_platforms_builds = [self.make_build(jdk, os_arch, task).build + galahad.exclude
     for task in [
       "test",
       "truffle_xcomp",
@@ -417,7 +417,7 @@
 
   # Coverage builds run on all platforms (platform = JDK + OS + ARCH)
   # that support JaCoCo (GR-46676)
-  local all_coverage_builds = [self.make_build(jdk, os_arch, task).build
+  local all_coverage_builds = [self.make_build(jdk, os_arch, task).build + galahad.exclude
     for task in [
       "coverage",
       "coverage_ctw",
@@ -433,7 +433,7 @@
 
     # Test ZGC on support platforms.  Windows requires version 1083 or later which will
     # probably require adding some capabilities.
-    local all_zgc_builds = [self.make_build(jdk, os_arch, task).build
+    local all_zgc_builds = [self.make_build(jdk, os_arch, task).build + galahad.exclude
       for jdk in [
         self.jdk_latest
       ]
@@ -453,7 +453,7 @@
     ],
 
   # Run unittests with SerialGC.
-  local all_serialgc_builds = [self.make_build(self.jdk_latest, os_arch, task).build
+  local all_serialgc_builds = [self.make_build(self.jdk_latest, os_arch, task).build + galahad.exclude
     for os_arch in [
       "linux-amd64",
       "linux-aarch64",

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": "d434751247c43b1ccb1c4e07dfc9f8731fbb93e4"
+    "overlay": "0fb9c2f58b07cc9b370baf3d6f5230aadb0aaf9a"
   }
 }
diff --git a/regex/ci/ci.jsonnet b/regex/ci/ci.jsonnet
@@ -1,7 +1,8 @@
 {
   local utils = (import '../../ci/ci_common/common-utils.libsonnet'),
   local common = import '../../ci/ci_common/common.jsonnet',
-
+  local galahad = import "../../ci/ci_common/galahad-common.libsonnet",
+
   local regex_common = {
     setup+: [
       ["cd", "./regex"],
@@ -15,8 +16,8 @@
     targets: ["gate"],
   },
 
-  local regex_gate_lite = regex_common + {
-    name: 'gate-regex-mac-lite-' + self.jdk_name,
+  local regex_gate_lite = regex_common + galahad.exclude {
+    name: 'weekly-regex-mac-lite-' + self.jdk_name,
     run: [
       ["mx", "build"],
       ["mx", "unittest", "--verbose", "com.oracle.truffle.regex"],

diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet
@@ -618,7 +618,7 @@ local devkits = graal_common.devkits;
     #
     # Gates
     #
-    vm.vm_java_21 + graal_common.deps.eclipse + graal_common.deps.jdt + self.vm_base('linux', 'amd64', 'gate') + galahad.include + {
+    vm.vm_java_21 + graal_common.deps.eclipse + graal_common.deps.jdt + self.vm_base('linux', 'amd64', 'gate') + galahad.exclude + {
      run: [
        ['mx', 'gate', '-B=--force-deprecation-as-warning', '--tags', 'style,fullbuild'],
      ],

diff --git a/vm/ci/ci_common/libgraal.jsonnet b/vm/ci/ci_common/libgraal.jsonnet
@@ -5,6 +5,7 @@ local devkits = graal_common.devkits;
 local c = import 'common.jsonnet';
 local g = vm.compiler_gate;
 local utils = import '../../../ci/ci_common/common-utils.libsonnet';
+local galahad = import '../../../ci/ci_common/galahad-common.libsonnet';
 
 {
   local underscore(s) = std.strReplace(s, "-", "_"),
@@ -79,7 +80,7 @@ local utils = import '../../../ci/ci_common/common-utils.libsonnet';
   # See definition of `gates` local variable in ../../compiler/ci_common/gate.jsonnet
   local gate_jobs = {
     "gate-vm-libgraal_compiler-labsjdk-latest-linux-amd64": {},
-    "gate-vm-libgraal_truffle-labsjdk-latest-linux-amd64": {},
+    "gate-vm-libgraal_truffle-labsjdk-latest-linux-amd64": {} + galahad.exclude,
     "gate-vm-libgraal_compiler_zgc-labsjdk-latest-linux-amd64": {},
     "gate-vm-libgraal_compiler_quickbuild-labsjdk-latest-linux-amd64": {},