Skip to content

Commit

Permalink
Add truffle gates on jdk-latest.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jchalou
jchalou committed Oct 6, 2023
1 parent a22eac8 commit 36ce9c0
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 64 deletions.
7 changes: 5 additions & 2 deletions ci/common.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,11 @@ local common_json = import "../common.json";
labsjdk20ce: self["labsjdk-ce-20"],
labsjdk20ee: self["labsjdk-ee-20"],

labsjdkLatestCE: self["labsjdk-ce-21"],
labsjdkLatestEE: self["labsjdk-ee-21"],
labsjdk21ce: self["labsjdk-ce-21"],
labsjdk21ee: self["labsjdk-ee-21"],

labsjdkLatestCE: self["labsjdk-ce-latest"],
labsjdkLatestEE: self["labsjdk-ee-latest"],

oraclejdkLatest: self["oraclejdk-latest"],
},
Expand Down
11 changes: 7 additions & 4 deletions sdk/ci/ci.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
local utils = import '../../ci/ci_common/common-utils.libsonnet',

local sdk_gate = {
downloads+: {
EXTRA_JAVA_HOMES: common.jdks_data['oraclejdk21'],
},
name: 'gate-sdk-oraclejdk' + self.jdk_version + '-' + self.os + '-' + self.arch,
setup: [
["cd", "./sdk"],
Expand All @@ -18,9 +21,9 @@
},

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,
common.linux_amd64 + common.oraclejdkLatest + sdk_gate + common.deps.eclipse + common.deps.jdt,
common.linux_amd64 + common.oraclejdk21 + sdk_gate + common.deps.eclipse + common.deps.jdt + common.mach5_target,
common.darwin_amd64 + common.oraclejdkLatest + sdk_gate,
common.darwin_amd64 + common.oraclejdk21 + sdk_gate + common.mach5_target,
]
}
36 changes: 21 additions & 15 deletions truffle/ci/ci.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@
},

local gate_lite = truffle_common + {
name: 'gate-truffle-mac-lite-oraclejdk-' + self.jdk_version,
name: 'gate-truffle-mac-lite-oraclejdk-' + self.jdk_name,
run: [
["mx", "build"],
["mx", "unittest", "--verbose"],
],
},

local sigtest = truffle_common + {
name: 'gate-truffle-sigtest-' + self.jdk_version,
name: 'gate-truffle-sigtest-' + self.jdk_name,
run: [
["mx", "build"],
["mx", "sigtest", "--check", (if self.jdk_version == 17 then "all" else "bin")],
["mx", "sigtest", "--check", (if self.jdk_version == 21 then "all" else "bin")],
],
},

local simple_tool_maven_project_gate = truffle_common + {
name: 'gate-external-mvn-simpletool-' + self.jdk_version,
name: 'gate-external-mvn-simpletool-' + self.jdk_name,
packages+: {
maven: "==3.3.9"
},
Expand All @@ -70,7 +70,7 @@
},

local simple_language_maven_project_gate = truffle_common + {
name: 'gate-external-mvn-simplelanguage-' + self.jdk_version,
name: 'gate-external-mvn-simplelanguage-' + self.jdk_name,
packages+: {
maven: "==3.3.9",
ruby: ">=2.1.0",
Expand Down Expand Up @@ -99,7 +99,10 @@
},

local truffle_gate = truffle_common + common.deps.eclipse + common.deps.jdt {
name: 'gate-truffle-oraclejdk-' + self.jdk_version,
downloads+: {
EXTRA_JAVA_HOMES: common.jdks_data['oraclejdk21'],
},
name: 'gate-truffle-oraclejdk-' + self.jdk_name,
run: [["mx", "--strict-compliance", "gate", "--strict-mode"]],
},

Expand All @@ -109,13 +112,16 @@
[
linux_amd64 + jdk + sigtest + guard,
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]
] for jdk in [common.oraclejdk21, common.oraclejdkLatest]
]) +
[
linux_amd64 + common.oraclejdk17 + truffle_gate + guard + {timelimit: "45:00"},
linux_amd64 + common.oraclejdk21 + truffle_gate + guard + {environment+: {DISABLE_DSL_STATE_BITS_TESTS: "true"}},
# The simple_language_maven_project_gate uses native-image, so we must run on labsjdk rather than oraclejdk
linux_amd64 + common.labsjdk21 + simple_language_maven_project_gate,
linux_amd64 + common.labsjdkLatest + simple_language_maven_project_gate,

linux_amd64 + common.oraclejdk21 + truffle_gate + guard + {timelimit: "45:00"},
linux_amd64 + common.oraclejdkLatest + truffle_gate + guard + {environment+: {DISABLE_DSL_STATE_BITS_TESTS: "true"}},

truffle_common + linux_amd64 + common.oraclejdk17 + guard {
name: "gate-truffle-javadoc",
Expand All @@ -125,7 +131,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"],
Expand All @@ -136,8 +142,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: [
Expand All @@ -146,8 +152,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"],
],
Expand Down
4 changes: 4 additions & 0 deletions vm/ci/ci_common/common.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,10 @@ local devkits = graal_common.devkits;
targets+: ['daily'],
},

daily_vm_darwin_aarch64: self.vm_darwin_aarch64 + {
targets+: ['daily'],
},

daily_vm_windows: self.vm_windows + {
targets+: ['daily'],
},
Expand Down
104 changes: 61 additions & 43 deletions vm/ci/ci_includes/vm-native.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,50 @@ local vm = import 'vm.jsonnet';
local vm_common = import '../ci_common/common.jsonnet';

{
local builds = [
vm.vm_java_21 + vm_common.svm_common_linux_amd64 + vm.custom_vm_linux + vm_common.gate_vm_linux_amd64 + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
['mx', '--dynamicimports', '$SVM_SUITE', '--disable-polyglot', '--disable-libpolyglot', 'gate', '--no-warning-as-error', '--tags', 'build,substratevm'],
],
timelimit: '40:00',
name: 'gate-vm-native-substratevm-truffle-linux-amd64',
},
vm.vm_java_21 + vm_common.svm_common_linux_amd64 + vm.custom_vm_linux + vm_common.gate_vm_linux_amd64 + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
['mx', '--dynamicimports', '$SVM_SUITE', '--disable-polyglot', '--disable-libpolyglot', 'gate', '--no-warning-as-error', '--tags', 'build,substratevm-quickbuild'],
],
timelimit: '40:00',
name: 'gate-vm-native-substratevm-truffle-quickbuild-linux-amd64',
local truffle_unchained = vm_common.svm_common_linux_amd64 + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
['mx', '--env', 'ce', '--native-images=lib:jvmcicompiler', 'gate', '--no-warning-as-error', '--tags', 'build,truffle-unchained'],
],
notify_emails: ["[email protected]", "[email protected]"],
timelimit: '30:00',
name: self.targets[0] + '-vm-ce-truffle-unchained-labs' + self.jdk_name + '-linux-amd64',
},

local native_substratevm_truffle = vm_common.svm_common_linux_amd64 + vm.custom_vm_linux + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
['mx', '--dynamicimports', '$SVM_SUITE', '--disable-polyglot', '--disable-libpolyglot', 'gate', '--no-warning-as-error', '--tags', 'build,substratevm' + self.gate_tag_suffix],
],
notify_emails: ["[email protected]", "[email protected]"],
timelimit: '40:00',
name: self.targets[0] + '-vm-native-substratevm-truffle' + self.gate_tag_suffix + '-labs' + self.jdk_name + '-linux-amd64',
},

local svm_truffle_tck = vm_common.svm_common_linux_amd64 + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
['mx', '--dynamicimports', '$SVM_SUITE,/tools', '--disable-polyglot', '--skip-libraries=true', '--force-bash-launchers=gu,native-image-configure,polybench', 'gate', '--no-warning-as-error', '--tags', 'build,svm_tck_test,svm_sl_tck'],
],
notify_emails: ["[email protected]", "[email protected]"],
timelimit: '35:00',
name: self.targets[0] + '-vm-svm-truffle-tck-labs' + self.jdk_name + '-linux-amd64',
},

local truffle_maven_downloader = vm_common.svm_common_linux_amd64 + vm_common.sulong_linux + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
['mx', '--env', 'ce-llvm', '--native-images=', 'gate', '--no-warning-as-error', '--tags', 'build,maven-downloader'],
],
notify_emails: ["[email protected]", "[email protected]"],
timelimit: '30:00',
packages+: {
maven: '>=3.3.9',
},
name: self.targets[0] + '-vm-ce-truffle-maven-downloader-labs' + self.jdk_name + '-linux-amd64',
},

local builds = [
vm.vm_java_21 + vm_common.svm_common_linux_amd64 + vm_common.sulong_linux + vm_common.graalpython_linux_amd64 + vm.custom_vm_linux + vm_common.gate_vm_linux_amd64 + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
Expand All @@ -27,33 +54,24 @@ local vm_common = import '../ci_common/common.jsonnet';
timelimit: '45:00',
name: 'gate-vm-native-graalpython-linux-amd64',
},
vm.vm_java_21 + vm_common.svm_common_linux_amd64 + vm_common.gate_vm_linux_amd64 + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
['mx', '--dynamicimports', '$SVM_SUITE,/tools', '--disable-polyglot', '--skip-libraries=true', '--force-bash-launchers=gu,native-image-configure,polybench', 'gate', '--no-warning-as-error', '--tags', 'build,svm_tck_test,svm_sl_tck'],
],
timelimit: '35:00',
name: 'gate-vm-svm-truffle-tck-linux-amd64',
},
vm.vm_java_21 + vm_common.svm_common_linux_amd64 + vm_common.gate_vm_linux_amd64 + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
['mx', '--env', 'ce', '--native-images=lib:jvmcicompiler', 'gate', '--no-warning-as-error', '--tags', 'build,truffle-unchained'],
],
timelimit: '30:00',
name: 'gate-vm-ce-truffle-unchained-linux-amd64',
},
vm.vm_java_21 + vm_common.svm_common_linux_amd64 + vm_common.sulong_linux + vm_common.gate_vm_linux_amd64 + {
run+: [
['export', 'SVM_SUITE=' + vm.svm_suite],
['mx', '--env', 'ce-llvm', '--native-images=', 'gate', '--no-warning-as-error', '--tags', 'build,maven-downloader'],
],
timelimit: '30:00',
name: 'gate-vm-ce-truffle-maven-downloader-linux-amd64',
packages+: {
maven: '>=3.3.9',
},
},
vm.vm_java_21 + vm_common.daily_vm_linux_amd64 + {
gate_tag_suffix: '',
} + native_substratevm_truffle,
vm.vm_java_21 + vm_common.daily_vm_linux_amd64 + {
gate_tag_suffix: '-quickbuild',
} + native_substratevm_truffle,
vm.vm_java_Latest + vm_common.gate_vm_linux_amd64 + {
gate_tag_suffix: '',
} + native_substratevm_truffle,
vm.vm_java_Latest + vm_common.gate_vm_linux_amd64 + {
gate_tag_suffix: '-quickbuild',
} + native_substratevm_truffle,
vm.vm_java_21 + vm_common.daily_vm_linux_amd64 + svm_truffle_tck,
vm.vm_java_Latest + vm_common.gate_vm_linux_amd64 + svm_truffle_tck,
vm.vm_java_21 + vm_common.daily_vm_linux_amd64 + truffle_unchained,
vm.vm_java_Latest + vm_common.gate_vm_linux_amd64 + truffle_unchained,
vm.vm_java_21 + vm_common.daily_vm_linux_amd64 + truffle_maven_downloader,
vm.vm_java_Latest + vm_common.gate_vm_linux_amd64 + truffle_maven_downloader,
],

builds: [{'defined_in': std.thisFile} + b for b in builds],
Expand Down

0 comments on commit 36ce9c0

Please sign in to comment.