Skip to content

Commit ae3015e

Browse files
eregoneregon
committed
CI: Explicitly add -amd64 for linux-amd64 for consistency
1 parent 1445dc7 commit ae3015e

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

‎ci.jsonnet

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -517,42 +517,42 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
517517
local native_tests = $.run.testdownstream_aot + $.run.test_integration + $.run.test_compiler,
518518

519519
# Order: platform, jdk, mx_env. Keep aligned for an easy visual comparison.
520-
"ruby-test-specs-linux-jdk-lts": $.platform.linux + $.jdk.lts + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
521-
"ruby-test-specs-linux-jdk-new": $.platform.linux + $.jdk.new + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
520+
"ruby-test-specs-linux-amd64-jdk-lts": $.platform.linux + $.jdk.lts + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
521+
"ruby-test-specs-linux-amd64-jdk-new": $.platform.linux + $.jdk.new + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
522522
"ruby-test-specs-darwin-amd64-jdk-lts": $.platform.darwin_amd64 + $.jdk.lts + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
523523
"ruby-test-specs-darwin-amd64-jdk-new": $.platform.darwin_amd64 + $.jdk.new + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
524524
"ruby-test-specs-darwin-aarch64-jdk-lts": $.platform.darwin_aarch64 + $.jdk.lts + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
525525
"ruby-test-specs-darwin-aarch64-jdk-new": $.platform.darwin_aarch64 + $.jdk.new + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
526526
"ruby-test-fast-linux-aarch64": $.platform.linux_aarch64 + $.jdk.lts + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "45:00" },
527-
"ruby-test-fast-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.run.test_fast + { timelimit: "45:00" }, # To catch missing slow tags
527+
"ruby-test-fast-linux-amd64": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.run.test_fast + { timelimit: "45:00" }, # To catch missing slow tags
528528
# "ruby-test-mri-asserts": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.run.test_mri_fast + { timelimit: "01:20:00" }, # GR-44572, GR-44753
529-
"ruby-test-mri-linux": $.platform.linux + $.jdk.lts + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
529+
"ruby-test-mri-linux-amd64": $.platform.linux + $.jdk.lts + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
530530
"ruby-test-mri-linux-aarch64": $.platform.linux_aarch64 + $.jdk.lts + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
531531
"ruby-test-mri-darwin-amd64": $.platform.darwin_amd64 + $.jdk.lts + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
532532
"ruby-test-mri-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
533-
"ruby-test-integration-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.run.test_integration,
534-
"ruby-test-cexts-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
533+
"ruby-test-integration-linux-amd64": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.run.test_integration,
534+
"ruby-test-cexts-linux-amd64": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
535535
"ruby-test-cexts-linux-aarch64": $.platform.linux_aarch64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
536536
"ruby-test-cexts-darwin-amd64": $.platform.darwin_amd64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "01:30:00" },
537537
"ruby-test-cexts-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "00:40:00" },
538-
"ruby-test-gems-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
538+
"ruby-test-gems-linux-amd64": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
539539
"ruby-test-gems-darwin-amd64": $.platform.darwin_amd64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
540540
"ruby-test-gems-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
541-
"ruby-test-ecosystem-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
542-
"ruby-test-standalone-linux": $.platform.linux + $.jdk.lts+ gate_no_build + $.run.test_make_standalone_distribution,
541+
"ruby-test-ecosystem-linux-amd64": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
542+
"ruby-test-standalone-linux-amd64": $.platform.linux + $.jdk.lts+ gate_no_build + $.run.test_make_standalone_distribution,
543543

544544
"ruby-test-compiler-graal-core-jdk-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
545545
"ruby-test-compiler-graal-core-jdk-new": $.platform.linux + $.jdk.new + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
546546
"ruby-test-compiler-graal-enterprise-jdk-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
547547
"ruby-test-compiler-graal-enterprise-jdk-new": $.platform.linux + $.jdk.new + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
548548

549-
"ruby-test-svm-graal-core-linux-jdk-lts": $.platform.linux + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
550-
"ruby-test-svm-graal-core-linux-jdk-new": $.platform.linux + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
549+
"ruby-test-svm-graal-core-linux-amd64-jdk-lts": $.platform.linux + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
550+
"ruby-test-svm-graal-core-linux-amd64-jdk-new": $.platform.linux + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
551551
"ruby-test-svm-graal-core-darwin-amd64-jdk-lts": $.platform.darwin_amd64 + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests,
552552
"ruby-test-svm-graal-core-darwin-amd64-jdk-new": $.platform.darwin_amd64 + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
553553
"ruby-test-svm-graal-core-darwin-aarch64-jdk-lts": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native + gate + native_tests,
554554
"ruby-test-svm-graal-core-darwin-aarch64-jdk-new": $.platform.darwin_aarch64 + $.jdk.new + $.env.native + gate + native_tests,
555-
"ruby-test-svm-graal-enterprise-linux": $.platform.linux + $.jdk.lts + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },
555+
"ruby-test-svm-graal-enterprise-linux-amd64": $.platform.linux + $.jdk.lts + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },
556556
"ruby-test-svm-graal-enterprise-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native_ee + gate + native_tests,
557557
},
558558

0 commit comments

Comments
 (0)