Skip to content

Commit 7292afa

Browse files
committed
[GR-46279] [GR-45839] Do not use macmini_late_2014_8gb CI machines
PullRequest: truffleruby/3824
2 parents 278dbd3 + 4f593d9 commit 7292afa

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

ci.jsonnet

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,23 +191,20 @@ local part_definitions = {
191191
GDB_BIN: "$GDB/bin/gdb",
192192
},
193193
},
194-
local darwin_amd64_enough_ram = { # GR-45839
195-
capabilities+: (if self.os == "darwin" && self.arch == "amd64" then ["!macmini_late_2014_8gb"] else []),
196-
},
197194
native: {
198195
mx_env:: "native",
199196
environment+: {
200197
HOST_VM: "svm",
201198
HOST_VM_CONFIG: "graal-core",
202199
},
203-
} + darwin_amd64_enough_ram,
200+
},
204201
native_ee: {
205202
mx_env:: "native-ee",
206203
environment+: {
207204
HOST_VM: "svm",
208205
HOST_VM_CONFIG: "graal-enterprise",
209206
},
210-
} + darwin_amd64_enough_ram,
207+
},
211208
host_inlining_log: {
212209
# Same as in mx.truffleruby/native-host-inlining
213210
mx_options+:: [
@@ -258,7 +255,8 @@ local part_definitions = {
258255
darwin_amd64: common.darwin_amd64 + common_deps + {
259256
platform_name:: "DarwinAMD64",
260257
"$.cap":: {
261-
normal_machine: ["darwin_mojave"],
258+
# GR-45839, GR-46279: exclude macmini_late_2014_8gb, they are too slow, have too little RAM and cause various timeouts
259+
normal_machine: ["darwin_mojave", "!macmini_late_2014_8gb"],
262260
},
263261
environment+: {
264262
LANG: "en_US.UTF-8",
@@ -551,7 +549,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
551549
"ruby-test-svm-graal-core-darwin-amd64-20": $.platform.darwin_amd64 + $.jdk.v20 + $.env.native + $.env.gdb_svm + gate + native_tests,
552550
"ruby-test-svm-graal-core-darwin-aarch64-17": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.native + gate + native_tests,
553551
"ruby-test-svm-graal-core-darwin-aarch64-20": $.platform.darwin_aarch64 + $.jdk.v20 + $.env.native + gate + native_tests,
554-
"ruby-test-svm-graal-enterprise-linux": $.platform.linux + $.jdk.v17 + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
552+
"ruby-test-svm-graal-enterprise-linux": $.platform.linux + $.jdk.v17 + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },
555553
"ruby-test-svm-graal-enterprise-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.native_ee + gate + native_tests,
556554
},
557555

0 commit comments

Comments
 (0)