diff --git a/ci/ci_common/common.jsonnet b/ci/ci_common/common.jsonnet index fc8a3175ac5..e8f438059cd 100644 --- a/ci/ci_common/common.jsonnet +++ b/ci/ci_common/common.jsonnet @@ -51,15 +51,8 @@ common + common.frequencies + { } + common.jdks + { # Aliases to edition specific labsjdks labsjdk17:: self["labsjdk-" + repo_config.graalvm_edition + "-17"], - labsjdk19:: self["labsjdk-" + repo_config.graalvm_edition + "-19"], labsjdk17Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-17Debug"], - labsjdk19Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-19Debug"], labsjdk17LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-17-llvm"], - labsjdk19LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-19-llvm"], - - labsjdk20:: self["labsjdk-" + repo_config.graalvm_edition + "-20"], - labsjdk20Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-20Debug"], - labsjdk20LLVM:: self["labsjdk-" + repo_config.graalvm_edition + "-20-llvm"], labsjdk21:: self["labsjdk-" + repo_config.graalvm_edition + "-21"], labsjdk21Debug:: self["labsjdk-" + repo_config.graalvm_edition + "-21Debug"], diff --git a/ci/common.jsonnet b/ci/common.jsonnet index 2a083b5cbdd..9b5e14620c3 100644 --- a/ci/common.jsonnet +++ b/ci/common.jsonnet @@ -14,12 +14,6 @@ local common_json = import "../common.json"; } + { [name]: common_json.jdks[name] + { jdk_version:: 17 } for name in ["oraclejdk17"] + variants("labsjdk-ce-17") + variants("labsjdk-ee-17") - } + { - [name]: common_json.jdks[name] + { jdk_version:: 19 } - for name in ["oraclejdk19"] + variants("labsjdk-ce-19") + variants("labsjdk-ee-19") - } + { - [name]: common_json.jdks[name] + { jdk_version:: 20 } - for name in ["oraclejdk20"] + variants("labsjdk-ce-20") + variants("labsjdk-ee-20") } + { [name]: common_json.jdks[name] + { jdk_version:: 21 } for name in ["oraclejdk21"] + variants("labsjdk-ce-21") + variants("labsjdk-ee-21") @@ -43,11 +37,6 @@ local common_json = import "../common.json"; for name in std.objectFields(jdks_data) } + { # Some convenient JDK aliases which don't require ["name"] for frequently-used JDKs - labsjdk17ce: self["labsjdk-ce-17"], - labsjdk17ee: self["labsjdk-ee-17"], - - labsjdk20ce: self["labsjdk-ce-20"], - labsjdk20ee: self["labsjdk-ee-20"], labsjdkLatestCE: self["labsjdk-ce-21"], labsjdkLatestEE: self["labsjdk-ee-21"], diff --git a/ci_includes/publish-javadoc.jsonnet b/ci_includes/publish-javadoc.jsonnet index 98211113403..486cd5f82d4 100644 --- a/ci_includes/publish-javadoc.jsonnet +++ b/ci_includes/publish-javadoc.jsonnet @@ -51,7 +51,7 @@ }, local all_builds = [ - common.post_merge + linux_amd64 + common.labsjdk17 + javadoc_publisher, + common.post_merge + linux_amd64 + common.labsjdk21 + javadoc_publisher, ], // adds a "defined_in" field to all builds mentioning the location of this current file builds:: [{ defined_in: std.thisFile } + b for b in all_builds] diff --git a/common.json b/common.json index fc7e1731ff6..3ce9f5bc811 100644 --- a/common.json +++ b/common.json @@ -18,22 +18,6 @@ "labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.8+2-jvmci-23.1-b02-debug", "platformspecific": true }, "labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.8+2-jvmci-23.1-b02-sulong", "platformspecific": true }, - "oraclejdk19": {"name": "jpg-jdk", "version": "19", "build_id": "26", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-19": {"name": "labsjdk", "version": "ce-19.0.1+10-jvmci-23.0-b04", "platformspecific": true }, - "labsjdk-ce-19Debug": {"name": "labsjdk", "version": "ce-19.0.1+10-jvmci-23.0-b04-debug", "platformspecific": true }, - "labsjdk-ce-19-llvm": {"name": "labsjdk", "version": "ce-19.0.1+10-jvmci-23.0-b04-sulong", "platformspecific": true }, - "labsjdk-ee-19": {"name": "labsjdk", "version": "ee-19.0.2+7-jvmci-23.0-b05", "platformspecific": true }, - "labsjdk-ee-19Debug": {"name": "labsjdk", "version": "ee-19.0.2+7-jvmci-23.0-b05-debug", "platformspecific": true }, - "labsjdk-ee-19-llvm": {"name": "labsjdk", "version": "ee-19.0.2+7-jvmci-23.0-b05-sulong", "platformspecific": true }, - - "oraclejdk20": {"name": "jpg-jdk", "version": "20", "build_id": "34", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-20": {"name": "labsjdk", "version": "ce-20.0.1+9-jvmci-23.1-b02", "platformspecific": true }, - "labsjdk-ce-20Debug": {"name": "labsjdk", "version": "ce-20.0.1+9-jvmci-23.1-b02-debug", "platformspecific": true }, - "labsjdk-ce-20-llvm": {"name": "labsjdk", "version": "ce-20.0.1+9-jvmci-23.1-b02-sulong", "platformspecific": true }, - "labsjdk-ee-20": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02", "platformspecific": true }, - "labsjdk-ee-20Debug": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-debug", "platformspecific": true }, - "labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true }, - "oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "33", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}, "labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21.0.2+13-jvmci-23.1-b30", "platformspecific": true }, "labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21.0.2+13-jvmci-23.1-b30-debug", "platformspecific": true }, diff --git a/sdk/ci/ci.jsonnet b/sdk/ci/ci.jsonnet index 2e729eba775..83ffa99c11b 100644 --- a/sdk/ci/ci.jsonnet +++ b/sdk/ci/ci.jsonnet @@ -19,8 +19,6 @@ builds: [ common.linux_amd64 + common.oraclejdk21 + sdk_gate + common.deps.eclipse + common.deps.jdt, - common.linux_amd64 + common.oraclejdk17 + sdk_gate + common.deps.eclipse + common.deps.jdt + common.mach5_target, common.darwin_amd64 + common.oraclejdk21 + sdk_gate, - common.darwin_amd64 + common.oraclejdk17 + sdk_gate + common.mach5_target, ] } diff --git a/sulong/ci/ci.jsonnet b/sulong/ci/ci.jsonnet index 883c771715b..938fcd66475 100644 --- a/sulong/ci/ci.jsonnet +++ b/sulong/ci/ci.jsonnet @@ -50,39 +50,8 @@ local sc = (import "ci_common/sulong-common.jsonnet"); sc.gate + $.sulong + sc.labsjdk21 + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,sulongStandalone,interop") + { name: "gate-sulong-standalone-interop-jdk21-windows-amd64", timelimit: "30:00" }, sc.gate + $.sulong + sc.labsjdk21 + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,nwcc,llvm,toolchain") + { name: "gate-sulong-nwcc-llvm-toolchain-jdk21-windows-amd64" }, - ], - standalone_builds:: - sc.mapPrototypePlatformName( - [ - sc.gate + $.sulong + sc.gateTags("standalone") { - job:: "test-ce-standalones-jvm", - extra_mx_args+:: ["--env", "ce-llvm-standalones", "--use-llvm-standalone=jvm"], - }, - sc.gate + $.sulong + sc.gateTags("standalone") { - job:: "test-ce-standalones-native", - extra_mx_args+:: ["--env", "ce-llvm-standalones", "--use-llvm-standalone=native"], - }, - ], - [ - [sc.linux_amd64, [sc.labsjdk21]], - [sc.darwin_amd64, [sc.labsjdk21]], - [sc.windows_amd64 + { capabilities+: ["windows_server_2016"] /* work around native-image bug GR-48515 */ }, [sc.labsjdk21]], - [sc.linux_aarch64, [sc.labsjdk21]], - [sc.darwin_aarch64, [sc.labsjdk21]], - ], - [ - { name: "gate-sulong-test-ce-standalones-jvm-jdk21-linux-amd64", timelimit: "1:00:00" }, - { name: "daily-sulong-test-ce-standalones-jvm-jdk21-darwin-amd64", timelimit: "1:00:00", targets: [] } + sc.daily, - { name: "gate-sulong-test-ce-standalones-jvm-jdk21-windows-amd64", timelimit: "1:00:00" }, - { name: "gate-sulong-test-ce-standalones-jvm-jdk21-linux-aarch64", timelimit: "1:00:00" }, - { name: "gate-sulong-test-ce-standalones-jvm-jdk21-darwin-aarch64", timelimit: "1:00:00" }, - { name: "gate-sulong-test-ce-standalones-native-jdk21-linux-amd64", timelimit: "1:00:00" }, - { name: "daily-sulong-test-ce-standalones-native-jdk21-darwin-amd64", timelimit: "1:00:00", targets: [] } + sc.daily, - { name: "gate-sulong-test-ce-standalones-native-jdk21-windows-amd64", timelimit: "1:00:00" }, - { name: "gate-sulong-test-ce-standalones-native-jdk21-linux-aarch64", timelimit: "1:00:00" }, - { name: "gate-sulong-test-ce-standalones-native-jdk21-darwin-aarch64", timelimit: "1:00:00" }, - ]), + ], coverage_builds:: sc.mapPrototypePlatformName([sc.weekly + $.sulong + sc.coverage($.regular_builds)], @@ -101,5 +70,5 @@ local sc = (import "ci_common/sulong-common.jsonnet"); { name: "weekly-sulong-coverage-jdk21-darwin-aarch64", timelimit: "1:00:00" }, ]), - builds: [ sc.defBuild(b) for b in self.regular_builds + self.standalone_builds + self.coverage_builds ], + builds: [ sc.defBuild(b) for b in self.regular_builds + self.coverage_builds ], } diff --git a/tools/ci/ci.jsonnet b/tools/ci/ci.jsonnet index 15a94b77e50..22df978278e 100644 --- a/tools/ci/ci.jsonnet +++ b/tools/ci/ci.jsonnet @@ -81,17 +81,13 @@ }, builds: [ - common.linux_amd64 + common.oraclejdk20 + tools_gate, - common.linux_amd64 + common.oraclejdk17 + tools_gate, + common.linux_amd64 + common.oraclejdk21 + tools_gate, - common.linux_amd64 + common.oraclejdk20 + tools_javadoc, - common.linux_amd64 + common.oraclejdk17 + tools_coverage_weekly, - common.linux_aarch64 + common.labsjdk17 + tools_gate_lite, + common.linux_amd64 + common.oraclejdk21 + tools_coverage_weekly, + common.linux_aarch64 + common.labsjdk21 + tools_gate_lite, - common.windows_amd64 + common.oraclejdk20 + tools_gate_lite + devkits["windows-jdk20"], - common.windows_amd64 + common.oraclejdk17 + tools_gate_lite + devkits["windows-jdk17"], + common.windows_amd64 + common.oraclejdk21 + tools_gate_lite + devkits["windows-jdk21"], - common.darwin_amd64 + common.oraclejdk20 + tools_gate_lite, - common.darwin_amd64 + common.oraclejdk17 + tools_gate_lite, + common.darwin_amd64 + common.oraclejdk21 + tools_gate_lite, ], } diff --git a/truffle/ci/ci.jsonnet b/truffle/ci/ci.jsonnet index 2fd76537436..0bfa9973461 100644 --- a/truffle/ci/ci.jsonnet +++ b/truffle/ci/ci.jsonnet @@ -111,10 +111,9 @@ linux_amd64 + jdk + simple_tool_maven_project_gate + common.mach5_target, linux_amd64 + jdk + simple_language_maven_project_gate, darwin_amd64 + jdk + truffle_weekly + gate_lite + guard, - ] for jdk in [common.oraclejdk21, common.oraclejdk17] + ] for jdk in [common.oraclejdk21] ]) + [ - linux_amd64 + common.oraclejdk17 + truffle_gate + guard + {timelimit: "45:00"}, linux_amd64 + common.oraclejdk21 + truffle_gate + guard + {environment+: {DISABLE_DSL_STATE_BITS_TESTS: "true"}}, truffle_common + linux_amd64 + common.oraclejdk17 + guard { @@ -125,7 +124,7 @@ ], }, - truffle_common + linux_amd64 + common.oraclejdk17 + guard { + truffle_common + linux_amd64 + common.oraclejdk21 + guard { name: "gate-truffle-slow-path-unittests", run: [ ["mx", "build", "-n", "-c", "-A-Atruffle.dsl.GenerateSlowPathOnly=true"], @@ -136,8 +135,8 @@ ], }, - truffle_common + windows_amd64 + common.oraclejdk17 + devkits["windows-jdk17"] + guard { - name: "gate-truffle-nfi-windows-17", + truffle_common + windows_amd64 + common.oraclejdk21 + devkits["windows-jdk21"] + guard { + name: "gate-truffle-nfi-windows-21", # TODO make that a full gate run # currently, some truffle unittests fail on windows run: [ @@ -146,8 +145,8 @@ ], }, - truffle_common + linux_amd64 + common.oraclejdk17 + common.deps.eclipse + common.deps.jdt + guard + { - name: "weekly-truffle-coverage-17-linux-amd64", + truffle_common + linux_amd64 + common.oraclejdk21 + common.deps.eclipse + common.deps.jdt + guard + { + name: "weekly-truffle-coverage-21-linux-amd64", run: [ ["mx", "--strict-compliance", "gate", "--strict-mode", "--jacoco-relativize-paths", "--jacoco-omit-src-gen", "--jacocout", "coverage", "--jacoco-format", "lcov"], ], diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet index 86babcf5700..db48131c43b 100644 --- a/vm/ci/ci_common/common.jsonnet +++ b/vm/ci/ci_common/common.jsonnet @@ -51,7 +51,6 @@ local devkits = graal_common.devkits; }, }, - common_vm_windows_jdk17: self.common_vm_windows + devkits['windows-jdk17'], common_vm_windows_jdk21: self.common_vm_windows + devkits['windows-jdk21'], # JS @@ -198,7 +197,6 @@ local devkits = graal_common.devkits; }, vm_windows: self.common_vm_windows + graal_common.windows_server_2016_amd64, - vm_windows_jdk17: self.common_vm_windows_jdk17 + graal_common.windows_server_2016_amd64, vm_windows_jdk21: self.common_vm_windows_jdk21 + graal_common.windows_server_2016_amd64, gate_vm_linux_amd64: self.vm_linux_amd64 + { @@ -964,10 +962,6 @@ local devkits = graal_common.devkits; # deploy_vm_espresso_java21_linux_amd64: vm.vm_java_21_llvm + self.full_vm_build_linux_amd64 + self.linux_deploy + self.deploy_vm_linux_amd64 + self.deploy_graalvm_espresso('linux', 'amd64', 'java21') + {name: 'post-merge-deploy-vm-espresso-java21-linux-amd64', notify_groups:: ["deploy"]}, - deploy_vm_espresso_java21_linux_aarch64: vm.vm_java_21 + self.full_vm_build_linux_aarch64 + self.linux_deploy + self.deploy_vm_linux_aarch64 + self.deploy_graalvm_espresso('linux', 'aarch64', 'java21') + {name: 'post-merge-deploy-vm-espresso-java21-linux-aarch64', notify_groups:: ["deploy"]}, - deploy_vm_espresso_java21_darwin_amd64: vm.vm_java_21_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_vm_darwin_amd64 + self.deploy_graalvm_espresso('darwin', 'amd64', 'java21') + {name: 'post-merge-deploy-vm-espresso-java21-darwin-amd64', notify_groups:: ["deploy"]}, - deploy_vm_espresso_java21_darwin_aarch64: vm.vm_java_21 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_vm_darwin_aarch64 + self.deploy_graalvm_espresso('darwin', 'aarch64', 'java21') + {name: 'post-merge-deploy-vm-espresso-java21-darwin-aarch64', notify_groups:: ["deploy"]}, - deploy_vm_espresso_java21_windows_amd64: vm.vm_java_21 + self.svm_common_windows_amd64("21") + self.sulong_windows + self.deploy_build + self.deploy_vm_windows_jdk21 + self.deploy_graalvm_espresso('windows', 'amd64', 'java21') + {name: 'post-merge-deploy-vm-espresso-java21-windows-amd64', notify_groups:: ["deploy"]}, local builds = [ # @@ -980,14 +974,6 @@ local devkits = graal_common.devkits; name: 'gate-vm-style-jdk21-linux-amd64', }, - vm.vm_java_21 + self.svm_common_linux_amd64 + self.sulong_linux + vm.custom_vm_linux + self.gate_vm_linux_amd64 + { - run: [ - ['export', 'SVM_SUITE=' + vm.svm_suite], - ['mx', '--dynamicimports', '$SVM_SUITE,/sulong', '--disable-polyglot', '--disable-libpolyglot', 'gate', '--no-warning-as-error', '--tags', 'build,sulong'], - ], - timelimit: '1:00:00', - name: 'gate-vm-native-sulong-' + self.jdk_version + '-linux-amd64', - }, ] + (import 'libgraal.jsonnet').builds, builds:: [{'defined_in': std.thisFile} + b for b in builds], diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet index 51c818de097..4adfb31e5b2 100644 --- a/vm/ci/ci_includes/vm.jsonnet +++ b/vm/ci/ci_includes/vm.jsonnet @@ -65,10 +65,6 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; {name: 'post-merge-deploy-vm-ruby-java21-darwin-amd64'}, {name: 'post-merge-deploy-vm-ruby-java21-darwin-aarch64'}, {name: 'post-merge-deploy-vm-espresso-java21-linux-amd64'}, - {name: 'post-merge-deploy-vm-espresso-java21-linux-aarch64'}, - {name: 'post-merge-deploy-vm-espresso-java21-darwin-amd64'}, - {name: 'post-merge-deploy-vm-espresso-java21-darwin-aarch64'}, - {name: 'post-merge-deploy-vm-espresso-java21-windows-amd64'}, ], targets+: ['daily'], notify_groups:: ['deploy'], @@ -229,10 +225,6 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; # Deploy the GraalVM Espresso image (GraalVM Base + espresso) # self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_espresso_java21_linux_amd64), - self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_espresso_java21_linux_aarch64), - self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_espresso_java21_darwin_amd64), - self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_espresso_java21_darwin_aarch64), - self.deploy_vm_publish_releaser_artifact(vm_common.deploy_vm_espresso_java21_windows_amd64), # Trigger the releaser service self.notify_releaser_build, diff --git a/wasm/ci/ci.jsonnet b/wasm/ci/ci.jsonnet index 7cd9b9ae7e9..0960b05f117 100644 --- a/wasm/ci/ci.jsonnet +++ b/wasm/ci/ci.jsonnet @@ -2,7 +2,6 @@ local graal_common = import "../../ci/ci_common/common.jsonnet"; local wasm_common = import 'ci_common/common.jsonnet'; local jdks = { - jdk17:: graal_common.labsjdk17, jdk21:: graal_common.labsjdk21, }; @@ -14,7 +13,6 @@ jdks + wasm_common + builds: [ # Gates. - $.jdk17 + $.linux_amd64 + $.gate + $.gate_graalwasm_style + {name: 'gate-graalwasm-style-fullbuild' + self.name_suffix}, $.jdk21 + $.linux_amd64 + $.gate + $.gate_graalwasm_style + {name: 'gate-graalwasm-style-fullbuild' + self.name_suffix}, ] + [ $.jdk21 + platform + $.gate + $.gate_graalwasm_full + {environment+: {GATE_TAGS: 'build,wasmtest'}} + {name: 'gate-graalwasm-unittest' + self.name_suffix}