Skip to content

Commit 3d8f768

Browse files
eregoneregon
committed
[GR-29152] CI: Test more on JDK11 and less on JDK8
PullRequest: truffleruby/2401
2 parents a2c8ba1 + ae1645c commit 3d8f768

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

‎ci.jsonnet

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
482482

483483
test_builds:
484484
{
485-
"ruby-lint": $.platform.linux + $.cap.gate + $.jdk.v8 + $.use.common + $.env.jvm + $.use.build_no_clean + $.run.lint + { timelimit: "30:00" },
485+
"ruby-lint": $.platform.linux + $.cap.gate + $.jdk.v11 + $.use.common + $.env.jvm + $.use.build_no_clean + $.run.lint + { timelimit: "30:00" },
486486
# Run specs on MRI to make sure new specs are compatible and have the needed version guards
487487
"ruby-test-specs-mri": $.platform.linux + $.cap.gate + $.use.common + $.run.test_specs_mri + { timelimit: "30:00" },
488488
} +
@@ -494,33 +494,33 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
494494
local native_tests = $.run.testdownstream_aot + $.run.test_integration + $.run.test_compiler,
495495

496496
// Order: platform, jdk, mx_env. Keep aligned for an easy visual comparison.
497-
"ruby-test-specs-linux": $.platform.linux + $.jdk.v8 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "50:00" },
497+
"ruby-test-specs-linux-8": $.platform.linux + $.jdk.v8 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "50:00" },
498498
"ruby-test-specs-linux-11": $.platform.linux + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "50:00" },
499-
"ruby-test-specs-darwin": $.platform.darwin + $.jdk.v8 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "01:35:00" },
499+
"ruby-test-specs-darwin-8": $.platform.darwin + $.jdk.v8 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "01:35:00" },
500500
"ruby-test-specs-darwin-11": $.platform.darwin + $.jdk.v11 + $.env.jvm + gate_no_build + $.use.build_no_clean + $.run.test_unit_tck + native_config + $.run.clean + $.run.test_specs + { timelimit: "01:35:00" },
501501
"ruby-test-fast-linux-arm64": $.platform.linux_arm64 + $.jdk.v11 + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "30:00" },
502-
"ruby-test-fast-linux": $.platform.linux + $.jdk.v8 + $.env.jvm + gate + $.run.test_fast + { timelimit: "30:00" }, # To catch missing slow tags
503-
"ruby-test-mri-linux": $.platform.linux + $.jdk.v8 + $.env.jvm + gate + $.run.test_mri + { timelimit: "45:00" },
504-
"ruby-test-mri-darwin": $.platform.darwin + $.jdk.v8 + $.env.jvm + gate + $.run.test_mri + { timelimit: "01:30:00" },
505-
"ruby-test-integration-linux": $.platform.linux + $.jdk.v8 + $.env.jvm + gate + $.run.test_integration,
506-
"ruby-test-cexts-linux": $.platform.linux + $.jdk.v8 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts,
507-
"ruby-test-cexts-darwin": $.platform.darwin + $.jdk.v8 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "01:20:00" },
508-
"ruby-test-gems-linux": $.platform.linux + $.jdk.v8 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
509-
"ruby-test-gems-darwin": $.platform.darwin + $.jdk.v8 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
510-
"ruby-test-ecosystem-linux": $.platform.linux + $.jdk.v8 + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
511-
"ruby-test-standalone-linux": $.platform.linux + $.jdk.v8 + gate_no_build + $.run.test_make_standalone_distribution,
512-
513-
"ruby-test-compiler-graal-core": $.platform.linux + $.jdk.v8 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
502+
"ruby-test-fast-linux": $.platform.linux + $.jdk.v11 + $.env.jvm + gate + $.run.test_fast + { timelimit: "30:00" }, # To catch missing slow tags
503+
"ruby-test-mri-linux": $.platform.linux + $.jdk.v11 + $.env.jvm + gate + $.run.test_mri + { timelimit: "45:00" },
504+
"ruby-test-mri-darwin": $.platform.darwin + $.jdk.v11 + $.env.jvm + gate + $.run.test_mri + { timelimit: "01:30:00" },
505+
"ruby-test-integration-linux": $.platform.linux + $.jdk.v11 + $.env.jvm + gate + $.run.test_integration,
506+
"ruby-test-cexts-linux": $.platform.linux + $.jdk.v11 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts,
507+
"ruby-test-cexts-darwin": $.platform.darwin + $.jdk.v11 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "01:20:00" },
508+
"ruby-test-gems-linux": $.platform.linux + $.jdk.v11 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
509+
"ruby-test-gems-darwin": $.platform.darwin + $.jdk.v11 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
510+
"ruby-test-ecosystem-linux": $.platform.linux + $.jdk.v11 + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
511+
"ruby-test-standalone-linux": $.platform.linux + $.jdk.v11+ gate_no_build + $.run.test_make_standalone_distribution,
512+
513+
"ruby-test-compiler-graal-core-8": $.platform.linux + $.jdk.v8 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
514514
"ruby-test-compiler-graal-core-11": $.platform.linux + $.jdk.v11 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
515-
"ruby-test-compiler-graal-enterprise": $.platform.linux + $.jdk.v8 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
515+
"ruby-test-compiler-graal-enterprise-8": $.platform.linux + $.jdk.v8 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
516516
"ruby-test-compiler-graal-enterprise-11": $.platform.linux + $.jdk.v11 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
517517

518-
"ruby-test-svm-graal-core-linux": $.platform.linux + $.jdk.v8 + $.env.native + gate + native_tests,
518+
"ruby-test-svm-graal-core-linux-8": $.platform.linux + $.jdk.v8 + $.env.native + gate + native_tests,
519519
"ruby-test-svm-graal-core-linux-11": $.platform.linux + $.jdk.v11 + $.env.native + gate + native_tests,
520-
"ruby-test-svm-graal-core-darwin": $.platform.darwin + $.jdk.v8 + $.env.native + gate + native_tests,
520+
"ruby-test-svm-graal-core-darwin-8": $.platform.darwin + $.jdk.v8 + $.env.native + gate + native_tests,
521521
"ruby-test-svm-graal-core-darwin-11": $.platform.darwin + $.jdk.v11 + $.env.native + gate + native_tests,
522-
"ruby-test-svm-graal-enterprise-linux": $.platform.linux + $.jdk.v8 + $.env.native_ee + gate + native_tests,
523-
"ruby-test-svm-graal-enterprise-darwin": $.platform.darwin + $.jdk.v8 + $.env.native_ee + gate + native_tests,
522+
"ruby-test-svm-graal-enterprise-linux": $.platform.linux + $.jdk.v11 + $.env.native_ee + gate + native_tests,
523+
"ruby-test-svm-graal-enterprise-darwin": $.platform.darwin + $.jdk.v11 + $.env.native_ee + gate + native_tests,
524524
},
525525

526526
local other_rubies = {
@@ -692,9 +692,9 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
692692
manual_builds: {
693693
local shared = $.use.common + $.cap.manual + { timelimit: "10:00" },
694694

695-
"ruby-generate-native-config-linux": $.platform.linux + $.jdk.v8 + shared + $.run.generate_native_config,
695+
"ruby-generate-native-config-linux": $.platform.linux + $.jdk.v11 + shared + $.run.generate_native_config,
696696
"ruby-generate-native-config-linux-arm64": $.platform.linux_arm64 + $.jdk.v11 + shared + $.run.generate_native_config,
697-
"ruby-generate-native-config-darwin": $.platform.darwin + $.jdk.v8 + shared + $.run.generate_native_config,
697+
"ruby-generate-native-config-darwin": $.platform.darwin + $.jdk.v11 + shared + $.run.generate_native_config,
698698
},
699699

700700
builds:

0 commit comments

Comments
 (0)