Skip to content

Commit 8ef5a68

Browse files
eregoneregon
committed
CI: refactor to express in terms of LTS and NEW JDK
1 parent 315e774 commit 8ef5a68

File tree

1 file changed

+52
-49
lines changed

1 file changed

+52
-49
lines changed

‎ci.jsonnet

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,9 @@ local part_definitions = {
230230
JT_JDK: "21",
231231
},
232232
},
233+
234+
lts: self.v17,
235+
new: self.v21,
233236
},
234237

235238
platform: {
@@ -503,7 +506,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
503506

504507
test_builds:
505508
{
506-
"ruby-lint": $.platform.linux + $.cap.gate + $.jdk.v17 + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "45:00" },
509+
"ruby-lint": $.platform.linux + $.cap.gate + $.jdk.lts + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "45:00" },
507510
# Run specs on CRuby to make sure new specs are compatible and have the needed version guards
508511
"ruby-test-specs-on-cruby": $.platform.linux + $.cap.gate + $.use.skip_ci + $.use.common + $.run.test_specs_mri + { timelimit: "45:00" },
509512
} +
@@ -515,43 +518,43 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
515518
local native_tests = $.run.testdownstream_aot + $.run.test_integration + $.run.test_compiler,
516519

517520
# Order: platform, jdk, mx_env. Keep aligned for an easy visual comparison.
518-
"ruby-test-specs-linux-17": $.platform.linux + $.jdk.v17 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
519-
"ruby-test-specs-linux-21": $.platform.linux + $.jdk.v21 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:20:00" },
520-
"ruby-test-specs-darwin-amd64-17": $.platform.darwin_amd64 + $.jdk.v17 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
521-
"ruby-test-specs-darwin-amd64-21": $.platform.darwin_amd64 + $.jdk.v21 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
522-
"ruby-test-specs-darwin-aarch64-17": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
523-
"ruby-test-specs-darwin-aarch64-21": $.platform.darwin_aarch64 + $.jdk.v21 + $.env.jvm + gate_no_build + $.use.build + $.run.test_unit_tck + native_config + $.run.test_specs + { timelimit: "01:40:00" },
524-
"ruby-test-fast-linux-aarch64": $.platform.linux_aarch64 + $.jdk.v17 + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "45:00" },
525-
"ruby-test-fast-linux": $.platform.linux + $.jdk.v17 + $.env.jvm + gate + $.run.test_fast + { timelimit: "45:00" }, # To catch missing slow tags
526-
# "ruby-test-mri-asserts": $.platform.linux + $.jdk.v17 + $.env.jvm + gate + $.run.test_mri_fast + { timelimit: "01:20:00" }, # GR-44572, GR-44753
527-
"ruby-test-mri-linux": $.platform.linux + $.jdk.v17 + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
528-
"ruby-test-mri-linux-aarch64": $.platform.linux_aarch64 + $.jdk.v17 + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
529-
"ruby-test-mri-darwin-amd64": $.platform.darwin_amd64 + $.jdk.v17 + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
530-
"ruby-test-mri-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
531-
"ruby-test-integration-linux": $.platform.linux + $.jdk.v17 + $.env.jvm + gate + $.run.test_integration,
532-
"ruby-test-cexts-linux": $.platform.linux + $.jdk.v17 + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
533-
"ruby-test-cexts-linux-aarch64": $.platform.linux_aarch64 + $.jdk.v17 + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
534-
"ruby-test-cexts-darwin-amd64": $.platform.darwin_amd64 + $.jdk.v17 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "01:30:00" },
535-
"ruby-test-cexts-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "00:40:00" },
536-
"ruby-test-gems-linux": $.platform.linux + $.jdk.v17 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
537-
"ruby-test-gems-darwin-amd64": $.platform.darwin_amd64 + $.jdk.v17 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
538-
"ruby-test-gems-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
539-
"ruby-test-ecosystem-linux": $.platform.linux + $.jdk.v17 + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
540-
"ruby-test-standalone-linux": $.platform.linux + $.jdk.v17+ gate_no_build + $.run.test_make_standalone_distribution,
541-
542-
"ruby-test-compiler-graal-core-17": $.platform.linux + $.jdk.v17 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
543-
"ruby-test-compiler-graal-core-21": $.platform.linux + $.jdk.v21 + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
544-
"ruby-test-compiler-graal-enterprise-17": $.platform.linux + $.jdk.v17 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
545-
"ruby-test-compiler-graal-enterprise-21": $.platform.linux + $.jdk.v21 + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
546-
547-
"ruby-test-svm-graal-core-linux-17": $.platform.linux + $.jdk.v17 + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
548-
"ruby-test-svm-graal-core-linux-21": $.platform.linux + $.jdk.v21 + $.env.native + $.env.gdb_svm + gate + native_tests,
549-
"ruby-test-svm-graal-core-darwin-amd64-17": $.platform.darwin_amd64 + $.jdk.v17 + $.env.native + $.env.gdb_svm + gate + native_tests,
550-
"ruby-test-svm-graal-core-darwin-amd64-21": $.platform.darwin_amd64 + $.jdk.v21 + $.env.native + $.env.gdb_svm + gate + native_tests,
551-
"ruby-test-svm-graal-core-darwin-aarch64-17": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.native + gate + native_tests,
552-
"ruby-test-svm-graal-core-darwin-aarch64-21": $.platform.darwin_aarch64 + $.jdk.v21 + $.env.native + gate + native_tests,
553-
"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" },
554-
"ruby-test-svm-graal-enterprise-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.v17 + $.env.native_ee + gate + native_tests,
521+
"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" },
522+
"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" },
523+
"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" },
524+
"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" },
525+
"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" },
526+
"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" },
527+
"ruby-test-fast-linux-aarch64": $.platform.linux_aarch64 + $.jdk.lts + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "45:00" },
528+
"ruby-test-fast-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.run.test_fast + { timelimit: "45:00" }, # To catch missing slow tags
529+
# "ruby-test-mri-asserts": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.run.test_mri_fast + { timelimit: "01:20:00" }, # GR-44572, GR-44753
530+
"ruby-test-mri-linux": $.platform.linux + $.jdk.lts + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
531+
"ruby-test-mri-linux-aarch64": $.platform.linux_aarch64 + $.jdk.lts + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
532+
"ruby-test-mri-darwin-amd64": $.platform.darwin_amd64 + $.jdk.lts + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
533+
"ruby-test-mri-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
534+
"ruby-test-integration-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.run.test_integration,
535+
"ruby-test-cexts-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
536+
"ruby-test-cexts-linux-aarch64": $.platform.linux_aarch64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
537+
"ruby-test-cexts-darwin-amd64": $.platform.darwin_amd64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "01:30:00" },
538+
"ruby-test-cexts-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "00:40:00" },
539+
"ruby-test-gems-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
540+
"ruby-test-gems-darwin-amd64": $.platform.darwin_amd64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
541+
"ruby-test-gems-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
542+
"ruby-test-ecosystem-linux": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
543+
"ruby-test-standalone-linux": $.platform.linux + $.jdk.lts+ gate_no_build + $.run.test_make_standalone_distribution,
544+
545+
"ruby-test-compiler-graal-core-jdk-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
546+
"ruby-test-compiler-graal-core-jdk-new": $.platform.linux + $.jdk.new + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
547+
"ruby-test-compiler-graal-enterprise-jdk-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
548+
"ruby-test-compiler-graal-enterprise-jdk-new": $.platform.linux + $.jdk.new + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
549+
550+
"ruby-test-svm-graal-core-linux-jdk-lts": $.platform.linux + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
551+
"ruby-test-svm-graal-core-linux-jdk-new": $.platform.linux + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
552+
"ruby-test-svm-graal-core-darwin-amd64-jdk-lts": $.platform.darwin_amd64 + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests,
553+
"ruby-test-svm-graal-core-darwin-amd64-jdk-new": $.platform.darwin_amd64 + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
554+
"ruby-test-svm-graal-core-darwin-aarch64-jdk-lts": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native + gate + native_tests,
555+
"ruby-test-svm-graal-core-darwin-aarch64-jdk-new": $.platform.darwin_aarch64 + $.jdk.new + $.env.native + gate + native_tests,
556+
"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" },
557+
"ruby-test-svm-graal-enterprise-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native_ee + gate + native_tests,
555558
},
556559

557560
local other_rubies = {
@@ -573,15 +576,15 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
573576

574577
bench_builds:
575578
{
576-
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
579+
local shared = $.platform.linux + $.jdk.lts + $.use.common +
577580
$.benchmark.runner + $.benchmark.compiler_metrics + { timelimit: "01:15:00" },
578581

579582
"ruby-metrics-compiler-graal-core": shared + graal_configurations["graal-core"],
580583
"ruby-metrics-compiler-graal-enterprise": shared + graal_configurations["graal-enterprise"],
581584
} +
582585

583586
{
584-
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
587+
local shared = $.platform.linux + $.jdk.lts + $.use.common +
585588
$.benchmark.runner + $.benchmark.svm_build_stats + { timelimit: "00:20:00" },
586589
# TODO this 2 jobs have GUEST_VM_CONFIG: 'default' instead of 'truffle', why?
587590
local guest_vm_override = { environment+: { GUEST_VM_CONFIG: "default" } },
@@ -591,15 +594,15 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
591594
} +
592595

593596
{
594-
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
597+
local shared = $.platform.linux + $.jdk.lts + $.use.common +
595598
$.benchmark.run_svm_metrics + { timelimit: "00:45:00" },
596599

597600
"ruby-metrics-svm-graal-core": shared + svm_configurations["svm-graal-core"],
598601
"ruby-metrics-svm-graal-enterprise": shared + svm_configurations["svm-graal-enterprise"],
599602
} +
600603

601604
{
602-
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
605+
local shared = $.platform.linux + $.jdk.lts + $.use.common +
603606
$.benchmark.runner + $.benchmark.classic,
604607

605608
"ruby-benchmarks-classic-mri": shared + other_rubies.mri + { timelimit: "00:55:00" },
@@ -611,7 +614,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
611614
} +
612615

613616
{
614-
local shared = $.platform.linux + $.jdk.v17 + $.use.common,
617+
local shared = $.platform.linux + $.jdk.lts + $.use.common,
615618

616619
local chunky = $.benchmark.runner + $.benchmark.chunky + { timelimit: "01:30:00" },
617620
"ruby-benchmarks-chunky-mri": shared + chunky + other_rubies.mri,
@@ -677,7 +680,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
677680

678681
{
679682
"ruby-metrics-truffle":
680-
$.platform.linux + $.jdk.v17 + $.use.common + $.env.jvm + $.use.build +
683+
$.platform.linux + $.jdk.lts + $.use.common + $.env.jvm + $.use.build +
681684
$.use.truffleruby +
682685
$.cap.bench + $.cap.daily +
683686
$.benchmark.runner + $.benchmark.interpreter_metrics +
@@ -686,7 +689,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
686689

687690
{
688691
"ruby-benchmarks-cext":
689-
$.platform.linux + $.jdk.v17 + $.use.common +
692+
$.platform.linux + $.jdk.lts + $.use.common +
690693
$.use.truffleruby + $.use.truffleruby_cexts +
691694
$.env.jvm_ce + $.use.build + $.use.gem_test_pack +
692695
$.cap.bench + $.cap.daily +
@@ -697,10 +700,10 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
697700
manual_builds: {
698701
local shared = $.use.common + $.cap.manual + { timelimit: "15:00" },
699702

700-
"ruby-generate-native-config-linux-amd64": $.platform.linux + $.jdk.v17 + shared + $.run.generate_native_config,
701-
"ruby-generate-native-config-linux-aarch64": $.platform.linux_aarch64 + $.jdk.v17 + shared + $.run.generate_native_config,
702-
"ruby-generate-native-config-darwin-amd64": $.platform.darwin_amd64 + $.jdk.v17 + shared + $.run.generate_native_config,
703-
"ruby-generate-native-config-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.v17 + shared + $.run.generate_native_config,
703+
"ruby-generate-native-config-linux-amd64": $.platform.linux + $.jdk.lts + shared + $.run.generate_native_config,
704+
"ruby-generate-native-config-linux-aarch64": $.platform.linux_aarch64 + $.jdk.lts + shared + $.run.generate_native_config,
705+
"ruby-generate-native-config-darwin-amd64": $.platform.darwin_amd64 + $.jdk.lts + shared + $.run.generate_native_config,
706+
"ruby-generate-native-config-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + shared + $.run.generate_native_config,
704707
},
705708

706709
builds:

0 commit comments

Comments
 (0)