Skip to content

Commit bddfc4b

Browse files
eregoneregon
committed
CI: Rename jdks for clarity: lts->stable and new->latest
1 parent 50d5227 commit bddfc4b

File tree

1 file changed

+55
-55
lines changed

1 file changed

+55
-55
lines changed

‎ci.jsonnet

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# https://github.com/google/jsonnet/releases and compiled.
1111

1212
# CONFIGURATION
13-
local overlay = "1a47807cf46687114e0423fff01a2103ae8bd727";
13+
local overlay = "9f9b842173d54228b4dd6c7fbcd788bac9a34d25";
1414

1515
# For debugging: generated builds will be restricted to those listed in
1616
# the array. No restriction is applied when it is empty.
@@ -226,8 +226,8 @@ local part_definitions = {
226226
jdk: {
227227
local with_path = { environment+: { path+:: ["$JAVA_HOME/bin"] } },
228228

229-
lts: with_path + common.jdks["labsjdk-ce-21"] + { environment+: { JT_JDK: "21" }, jdk_label:: 'lts' },
230-
new: with_path + common.jdks["labsjdk-ce-latest"] + { environment+: { JT_JDK: "latest" }, jdk_label:: 'new' },
229+
stable: with_path + common.jdks["labsjdk-ce-21"] + { environment+: { JT_JDK: "21" }, jdk_label:: 'stable' },
230+
latest: with_path + common.jdks["labsjdk-ce-latest"] + { environment+: { JT_JDK: "latest" }, jdk_label:: 'latest' },
231231
},
232232

233233
platform: {
@@ -506,7 +506,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
506506

507507
test_builds:
508508
{
509-
"ruby-lint": $.platform.linux + $.cap.gate + $.jdk.lts + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "45:00" },
509+
"ruby-lint": $.platform.linux + $.cap.gate + $.jdk.stable + $.use.common + $.env.jvm + $.use.build + $.run.lint + { timelimit: "45:00" },
510510
# Run specs on CRuby to make sure new specs are compatible and have the needed version guards
511511
"ruby-test-specs-on-cruby": $.platform.linux + $.cap.gate + $.use.skip_ci + $.use.common + $.run.test_specs_mri + { timelimit: "45:00" },
512512
} +
@@ -518,44 +518,44 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
518518
local native_tests = $.run.testdownstream_aot + $.run.test_integration + $.run.test_compiler,
519519

520520
# Order: platform, jdk, mx_env. Keep aligned for an easy visual comparison.
521-
"ruby-test-specs-linux-amd64-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-amd64-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-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-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-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-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-amd64": $.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-amd64": $.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-amd64": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.run.test_integration,
535-
"ruby-test-cexts-linux-amd64": $.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-amd64": $.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-amd64": $.platform.linux + $.jdk.lts + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
543-
"ruby-test-standalone-linux-amd64": $.platform.linux + $.jdk.lts+ gate_no_build + $.run.test_make_standalone_distribution,
544-
545-
"ruby-test-compiler-ce-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
546-
"ruby-test-compiler-ce-new": $.platform.linux + $.jdk.new + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
547-
"ruby-test-compiler-ee-lts": $.platform.linux + $.jdk.lts + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
548-
"ruby-test-compiler-ee-new": $.platform.linux + $.jdk.new + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
549-
550-
"ruby-test-svm-ce-linux-amd64-lts": $.platform.linux + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
551-
"ruby-test-svm-ce-linux-amd64-new": $.platform.linux + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
552-
"ruby-test-svm-ce-darwin-amd64-lts": $.platform.darwin_amd64 + $.jdk.lts + $.env.native + $.env.gdb_svm + gate + native_tests,
553-
"ruby-test-svm-ce-darwin-amd64-new": $.platform.darwin_amd64 + $.jdk.new + $.env.native + $.env.gdb_svm + gate + native_tests,
554-
"ruby-test-svm-ce-darwin-aarch64-lts": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native + gate + native_tests,
555-
"ruby-test-svm-ce-darwin-aarch64-new": $.platform.darwin_aarch64 + $.jdk.new + $.env.native + gate + native_tests,
556-
"ruby-test-svm-ee-linux-amd64": $.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-ee-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + $.env.native_ee + gate + native_tests,
558-
"ruby-test-svm-ee-aux-linux-amd64": $.platform.linux + $.jdk.lts + $.env.native_ee_aux + $.env.gdb_svm + gate + native_tests + { timelimit: "01:30:00" },
521+
"ruby-test-specs-linux-amd64-stable": $.platform.linux + $.jdk.stable + $.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-amd64-latest": $.platform.linux + $.jdk.latest + $.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-stable": $.platform.darwin_amd64 + $.jdk.stable + $.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-latest": $.platform.darwin_amd64 + $.jdk.latest + $.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-stable": $.platform.darwin_aarch64 + $.jdk.stable + $.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-latest": $.platform.darwin_aarch64 + $.jdk.latest + $.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.stable + $.env.jvm + gate + $.run.test_fast + native_config + { timelimit: "45:00" },
528+
"ruby-test-fast-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.run.test_fast + { timelimit: "45:00" }, # To catch missing slow tags
529+
# "ruby-test-mri-asserts": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.run.test_mri_fast + { timelimit: "01:20:00" }, # GR-44572, GR-44753
530+
"ruby-test-mri-linux-amd64": $.platform.linux + $.jdk.stable + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
531+
"ruby-test-mri-linux-aarch64": $.platform.linux_aarch64 + $.jdk.stable + $.env.native + gate + $.run.test_mri + { timelimit: "01:20:00" },
532+
"ruby-test-mri-darwin-amd64": $.platform.darwin_amd64 + $.jdk.stable + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
533+
"ruby-test-mri-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + $.env.native + gate + $.run.test_mri + { timelimit: "01:30:00" },
534+
"ruby-test-integration-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.run.test_integration,
535+
"ruby-test-cexts-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
536+
"ruby-test-cexts-linux-aarch64": $.platform.linux_aarch64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.use.sqlite331 + $.run.test_cexts,
537+
"ruby-test-cexts-darwin-amd64": $.platform.darwin_amd64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "01:30:00" },
538+
"ruby-test-cexts-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_cexts + { timelimit: "00:40:00" },
539+
"ruby-test-gems-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
540+
"ruby-test-gems-darwin-amd64": $.platform.darwin_amd64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
541+
"ruby-test-gems-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + $.env.jvm + gate + $.use.gem_test_pack + $.run.test_gems,
542+
"ruby-test-ecosystem-linux-amd64": $.platform.linux + $.jdk.stable + $.env.jvm + gate + $.use.node + $.use.sqlite331 + $.use.gem_test_pack + $.run.test_ecosystem,
543+
"ruby-test-standalone-linux-amd64": $.platform.linux + $.jdk.stable+ gate_no_build + $.run.test_make_standalone_distribution,
544+
545+
"ruby-test-compiler-ce-stable": $.platform.linux + $.jdk.stable + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
546+
"ruby-test-compiler-ce-latest": $.platform.linux + $.jdk.latest + $.env.jvm_ce + gate + $.use.truffleruby + $.run.test_compiler,
547+
"ruby-test-compiler-ee-stable": $.platform.linux + $.jdk.stable + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
548+
"ruby-test-compiler-ee-latest": $.platform.linux + $.jdk.latest + $.env.jvm_ee + gate + $.use.truffleruby + $.run.test_compiler,
549+
550+
"ruby-test-svm-ce-linux-amd64-stable": $.platform.linux + $.jdk.stable + $.env.native + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log,
551+
"ruby-test-svm-ce-linux-amd64-latest": $.platform.linux + $.jdk.latest + $.env.native + $.env.gdb_svm + gate + native_tests,
552+
"ruby-test-svm-ce-darwin-amd64-stable": $.platform.darwin_amd64 + $.jdk.stable + $.env.native + $.env.gdb_svm + gate + native_tests,
553+
"ruby-test-svm-ce-darwin-amd64-latest": $.platform.darwin_amd64 + $.jdk.latest + $.env.native + $.env.gdb_svm + gate + native_tests,
554+
"ruby-test-svm-ce-darwin-aarch64-stable": $.platform.darwin_aarch64 + $.jdk.stable + $.env.native + gate + native_tests,
555+
"ruby-test-svm-ce-darwin-aarch64-latest": $.platform.darwin_aarch64 + $.jdk.latest + $.env.native + gate + native_tests,
556+
"ruby-test-svm-ee-linux-amd64": $.platform.linux + $.jdk.stable + $.env.native_ee + $.env.gdb_svm + gate + native_tests + $.env.host_inlining_log + { timelimit: "01:30:00" },
557+
"ruby-test-svm-ee-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + $.env.native_ee + gate + native_tests,
558+
"ruby-test-svm-ee-aux-linux-amd64": $.platform.linux + $.jdk.stable + $.env.native_ee_aux + $.env.gdb_svm + gate + native_tests + { timelimit: "01:30:00" },
559559
},
560560

561561
local other_rubies = {
@@ -577,15 +577,15 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
577577

578578
bench_builds:
579579
{
580-
local shared = $.platform.linux + $.jdk.lts + $.use.common +
580+
local shared = $.platform.linux + $.jdk.stable + $.use.common +
581581
$.benchmark.runner + $.benchmark.compiler_metrics + { timelimit: "01:15:00" },
582582

583583
"ruby-metrics-compiler-jvm-ce": shared + graal_configurations["jvm-ce"],
584584
"ruby-metrics-compiler-jvm-ee": shared + graal_configurations["jvm-ee"],
585585
} +
586586

587587
{
588-
local shared = $.platform.linux + $.jdk.lts + $.use.common +
588+
local shared = $.platform.linux + $.jdk.stable + $.use.common +
589589
$.benchmark.runner + $.benchmark.svm_build_stats + { timelimit: "00:20:00" },
590590
# TODO this 2 jobs have GUEST_VM_CONFIG: 'default' instead of 'truffle', why?
591591
local guest_vm_override = { environment+: { GUEST_VM_CONFIG: "default" } },
@@ -595,15 +595,15 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
595595
} +
596596

597597
{
598-
local shared = $.platform.linux + $.jdk.lts + $.use.common +
598+
local shared = $.platform.linux + $.jdk.stable + $.use.common +
599599
$.benchmark.run_svm_metrics + { timelimit: "00:45:00" },
600600

601601
"ruby-metrics-svm-ce": shared + svm_configurations["svm-ce"],
602602
"ruby-metrics-svm-ee": shared + svm_configurations["svm-ee"],
603603
} +
604604

605605
{
606-
local shared = $.platform.linux + $.jdk.lts + $.use.common +
606+
local shared = $.platform.linux + $.jdk.stable + $.use.common +
607607
$.benchmark.runner + $.benchmark.classic,
608608

609609
"ruby-benchmarks-classic-mri": shared + other_rubies.mri + { timelimit: "00:55:00" },
@@ -615,7 +615,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
615615
} +
616616

617617
{
618-
local shared = $.platform.linux + $.jdk.lts + $.use.common,
618+
local shared = $.platform.linux + $.jdk.stable + $.use.common,
619619

620620
local chunky = $.benchmark.runner + $.benchmark.chunky + { timelimit: "01:30:00" },
621621
"ruby-benchmarks-chunky-mri": shared + chunky + other_rubies.mri,
@@ -681,7 +681,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
681681

682682
{
683683
"ruby-metrics-truffle":
684-
$.platform.linux + $.jdk.lts + $.use.common + $.env.jvm + $.use.build +
684+
$.platform.linux + $.jdk.stable + $.use.common + $.env.jvm + $.use.build +
685685
$.use.truffleruby +
686686
$.cap.bench + $.cap.daily +
687687
$.benchmark.runner + $.benchmark.interpreter_metrics +
@@ -690,7 +690,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
690690

691691
{
692692
"ruby-benchmarks-cext":
693-
$.platform.linux + $.jdk.lts + $.use.common +
693+
$.platform.linux + $.jdk.stable + $.use.common +
694694
$.use.truffleruby + $.use.truffleruby_cexts +
695695
$.env.jvm_ce + $.use.build + $.use.gem_test_pack +
696696
$.cap.bench + $.cap.daily +
@@ -701,19 +701,19 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
701701
manual_builds: {
702702
local shared = $.use.common + $.cap.manual + { timelimit: "15:00" },
703703

704-
"ruby-generate-native-config-linux-amd64": $.platform.linux + $.jdk.lts + shared + $.run.generate_native_config,
705-
"ruby-generate-native-config-linux-aarch64": $.platform.linux_aarch64 + $.jdk.lts + shared + $.run.generate_native_config,
706-
"ruby-generate-native-config-darwin-amd64": $.platform.darwin_amd64 + $.jdk.lts + shared + $.run.generate_native_config,
707-
"ruby-generate-native-config-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.lts + shared + $.run.generate_native_config,
704+
"ruby-generate-native-config-linux-amd64": $.platform.linux + $.jdk.stable + shared + $.run.generate_native_config,
705+
"ruby-generate-native-config-linux-aarch64": $.platform.linux_aarch64 + $.jdk.stable + shared + $.run.generate_native_config,
706+
"ruby-generate-native-config-darwin-amd64": $.platform.darwin_amd64 + $.jdk.stable + shared + $.run.generate_native_config,
707+
"ruby-generate-native-config-darwin-aarch64": $.platform.darwin_aarch64 + $.jdk.stable + shared + $.run.generate_native_config,
708708
},
709709

710710
builds:
711711
local all_builds = $.test_builds + $.bench_builds + $.manual_builds;
712-
local filtered_builds = if $.jdk.lts.jdk_version == $.jdk.new.jdk_version then
712+
local filtered_builds = if $.jdk.stable.jdk_version == $.jdk.latest.jdk_version then
713713
{
714714
[k]: all_builds[k]
715715
for k in std.objectFields(all_builds)
716-
if !std.objectHasAll(all_builds[k], "jdk_label") || all_builds[k].jdk_label == $.jdk.lts.jdk_label
716+
if !std.objectHasAll(all_builds[k], "jdk_label") || all_builds[k].jdk_label == $.jdk.stable.jdk_label
717717
}
718718
else
719719
all_builds;

0 commit comments

Comments
 (0)