From 2975d1c9b6a673ae0869488e6c662bacf1c5fe07 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Mon, 13 Jan 2025 16:30:06 +0200 Subject: [PATCH 1/3] Switch ruby-test-mri-* CI jobs to native-ee to workaround OOM issue The issue is reproducible often on the ruby-test-mri-linux-amd64 CI job. Other jobs are changed for consistency. See https://jira.oci.oraclecorp.com/browse/GR-61281 for details --- ci.jsonnet | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci.jsonnet b/ci.jsonnet index e67c63145120..4c70ad079d3c 100644 --- a/ci.jsonnet +++ b/ci.jsonnet @@ -534,10 +534,10 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, " "ruby-test-fast-linux-aarch64": $.platform.linux_aarch64 + $.jdk.latest + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "45:00" }, "ruby-test-fast-linux-amd64": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.run.test_fast + { timelimit: "45:00" }, # To catch missing slow tags "ruby-test-mri-asserts": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.run.test_mri_fast + { timelimit: "01:15:00" }, - "ruby-test-mri-linux-amd64": $.platform.linux + $.jdk.latest + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" }, - # "ruby-test-mri-linux-aarch64": $.platform.linux_aarch64 + $.jdk.latest + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" }, # GR-51361 - "ruby-test-mri-darwin-amd64": $.platform.darwin_amd64 + $.jdk.latest + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" }, - "ruby-test-mri-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.latest + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" }, + "ruby-test-mri-linux-amd64": $.platform.linux + $.jdk.latest + $.env.native_ee + gate + $.run.test_mri + { timelimit: "01:20:00" }, + # "ruby-test-mri-linux-aarch64": $.platform.linux_aarch64 + $.jdk.latest + $.env.native_ee + gate + $.run.test_mri + { timelimit: "01:30:00" }, # GR-51361 + "ruby-test-mri-darwin-amd64": $.platform.darwin_amd64 + $.jdk.latest + $.env.native_ee + gate + $.run.test_mri + { timelimit: "01:30:00" }, + "ruby-test-mri-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.latest + $.env.native_ee + gate + $.run.test_mri + { timelimit: "01:30:00" }, "ruby-test-integration-linux-amd64": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.run.test_integration, "ruby-test-cexts-linux-amd64": $.platform.linux + $.jdk.latest + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts, "ruby-test-cexts-linux-aarch64": $.platform.linux_aarch64 + $.jdk.latest + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts, From 9fd7ce8b978ed6b8bb78ffca36baf1455d081430 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Mon, 13 Jan 2025 19:09:33 +0200 Subject: [PATCH 2/3] Exclude failing MRI tests See https://ol-bitbucket.us.oracle.com/plugins/servlet/jira-integration/issues/GR-15504 --- test/mri/excludes/TestGc.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/mri/excludes/TestGc.rb b/test/mri/excludes/TestGc.rb index 2ec049c0cd5f..78f23f496b80 100644 --- a/test/mri/excludes/TestGc.rb +++ b/test/mri/excludes/TestGc.rb @@ -1,7 +1,9 @@ +exclude :test_count, "GR-15504: Expected 0 to be < 0." exclude :test_exception_in_finalizer_method, "needs investigation" exclude :test_exception_in_finalizer_procs, "transient" exclude :test_finalizer_passed_object_id, "needs investigation" exclude :test_finalizing_main_thread, "| -:1:in `define_finalizer': wrong number of arguments (given 1, expected 2) (ArgumentError)" +exclude :test_gc_disabled_start, "GR-15504: <1> expected but was <0>." exclude :test_gc_internals, "NameError: uninitialized constant GC::INTERNAL_CONSTANTS" exclude :test_gc_parameter, "slow: 32.16s on truffleruby 24.2.0-dev-b555f590, like ruby 3.2.4, GraalVM CE JVM [x86_64-linux] with AMD Ryzen 7 3700X 8-Core Processor: (16 vCPUs)" exclude :test_gc_parameter_init_slots, "NoMethodError: undefined method `stat_heap' for GC:Module" From 468b5810f7da0f7176e657af5ae4be86a363d244 Mon Sep 17 00:00:00 2001 From: Andrew Konchin Date: Mon, 13 Jan 2025 19:11:41 +0200 Subject: [PATCH 3/3] Update MRI tests retagging logic and retain tests with Jira ticket number in the excluding comment So don't retag tests when excluding comment contains e.g. 'GR-15504' --- tool/jt.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/tool/jt.rb b/tool/jt.rb index 2e748d5c78d1..1460ab4e51aa 100755 --- a/tool/jt.rb +++ b/tool/jt.rb @@ -53,6 +53,7 @@ /transient/, /if RUBY_PLATFORM/, /pid \d+ (exit|killed)/, + /GR-\d+/ # mentioning an existing ticket number ] RUBOCOP_INCLUDE_LIST = %w[