Skip to content

Commit 1445dc7

Browse files
eregoneregon
committed
CI: refactor to express in terms of LTS and NEW JDK
1 parent 00c67fc commit 1445dc7

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
@@ -229,6 +229,9 @@ local part_definitions = {
229229
JT_JDK: "21",
230230
},
231231
},
232+
233+
lts: self.v17,
234+
new: self.v21,
232235
},
233236

234237
platform: {
@@ -502,7 +505,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
502505

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

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

556559
local other_rubies = {
@@ -572,15 +575,15 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
572575

573576
bench_builds:
574577
{
575-
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
578+
local shared = $.platform.linux + $.jdk.lts + $.use.common +
576579
$.benchmark.runner + $.benchmark.compiler_metrics + { timelimit: "01:15:00" },
577580

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

582585
{
583-
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
586+
local shared = $.platform.linux + $.jdk.lts + $.use.common +
584587
$.benchmark.runner + $.benchmark.svm_build_stats + { timelimit: "00:20:00" },
585588
# TODO this 2 jobs have GUEST_VM_CONFIG: 'default' instead of 'truffle', why?
586589
local guest_vm_override = { environment+: { GUEST_VM_CONFIG: "default" } },
@@ -590,15 +593,15 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
590593
} +
591594

592595
{
593-
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
596+
local shared = $.platform.linux + $.jdk.lts + $.use.common +
594597
$.benchmark.run_svm_metrics + { timelimit: "00:45:00" },
595598

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

600603
{
601-
local shared = $.platform.linux + $.jdk.v17 + $.use.common +
604+
local shared = $.platform.linux + $.jdk.lts + $.use.common +
602605
$.benchmark.runner + $.benchmark.classic,
603606

604607
"ruby-benchmarks-classic-mri": shared + other_rubies.mri + { timelimit: "00:55:00" },
@@ -610,7 +613,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
610613
} +
611614

612615
{
613-
local shared = $.platform.linux + $.jdk.v17 + $.use.common,
616+
local shared = $.platform.linux + $.jdk.lts + $.use.common,
614617

615618
local chunky = $.benchmark.runner + $.benchmark.chunky + { timelimit: "01:30:00" },
616619
"ruby-benchmarks-chunky-mri": shared + chunky + other_rubies.mri,
@@ -676,7 +679,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
676679

677680
{
678681
"ruby-metrics-truffle":
679-
$.platform.linux + $.jdk.v17 + $.use.common + $.env.jvm + $.use.build +
682+
$.platform.linux + $.jdk.lts + $.use.common + $.env.jvm + $.use.build +
680683
$.use.truffleruby +
681684
$.cap.bench + $.cap.daily +
682685
$.benchmark.runner + $.benchmark.interpreter_metrics +
@@ -685,7 +688,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
685688

686689
{
687690
"ruby-benchmarks-cext":
688-
$.platform.linux + $.jdk.v17 + $.use.common +
691+
$.platform.linux + $.jdk.lts + $.use.common +
689692
$.use.truffleruby + $.use.truffleruby_cexts +
690693
$.env.jvm_ce + $.use.build + $.use.gem_test_pack +
691694
$.cap.bench + $.cap.daily +
@@ -696,10 +699,10 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
696699
manual_builds: {
697700
local shared = $.use.common + $.cap.manual + { timelimit: "15:00" },
698701

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

705708
builds:

0 commit comments

Comments
 (0)