From dd764a6df306fc92498420db7e6928830aea4688 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 18 Dec 2023 17:28:10 +0100 Subject: [PATCH] Port jobs to JDK-latest. --- ci/common.jsonnet | 2 ++ vm/ci/ci_common/common.jsonnet | 7 ++----- vm/ci/ci_includes/vm-native.jsonnet | 2 +- vm/ci/ci_includes/vm.jsonnet | 8 ++++---- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ci/common.jsonnet b/ci/common.jsonnet index 81b854e71687..6437e7ea7880 100644 --- a/ci/common.jsonnet +++ b/ci/common.jsonnet @@ -116,6 +116,8 @@ local common_json = import "../common.json"; "linux-jdk19": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }}, "linux-jdk20": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }}, "linux-jdk21": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }}, + "linux-jdk-latest": { packages+: { "devkit:gcc11.2.0-OL6.4+1": "==0" }}, + "linux-jdkLatest": self["linux-jdk-latest"], }, # Dependencies diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet index c84478a34d35..8583007d6147 100644 --- a/vm/ci/ci_common/common.jsonnet +++ b/vm/ci/ci_common/common.jsonnet @@ -47,7 +47,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'], common_vm_windows_jdkLatest: self.common_vm_windows + devkits['windows-jdkLatest'], @@ -192,17 +191,15 @@ 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, vm_windows_jdkLatest: self.common_vm_windows_jdkLatest + graal_common.windows_server_2016_amd64, vm_windows_amd64: self.vm_windows, - vm_windows_amd64_jdk17: self.vm_windows_jdk17, vm_windows_amd64_jdk21: self.vm_windows_jdk21, vm_windows_amd64_jdkLatest: self.vm_windows_jdkLatest, vm_base(os, arch, main_target, deploy=false, bench=false, os_distro=null, jdk_hint=null): vm.default_diskspace_required(os, arch, large=deploy) - + self['vm_' + os + '_' + arch + (if (os_distro != null) then '_' + os_distro else '') + (if (jdk_hint != null) then '_jdk' + jdk_hint else '')] # examples: `self.vm_linux_amd64_ubuntu`, `self.vm_windows_amd_jdkLatest` + + self['vm_' + os + '_' + arch + (if (os_distro != null) then '_' + os_distro else '') + (if (jdk_hint != null) then '_jdk' + jdk_hint else '')] # examples: `self.vm_linux_amd64_ubuntu`, `self.vm_windows_amd64_jdkLatest` + { targets+: [main_target] + (if (deploy) then ['deploy'] else []) + (if (bench) then ['bench'] else []) } + (if (bench) then { capabilities+: ['no_frequency_scaling'] } else {}), @@ -289,7 +286,7 @@ local devkits = graal_common.devkits; else if (os == 'windows') then if (arch == 'amd64') then # Windows/AMD64 - java_deps(edition) + self.svm_common_windows_amd64("21") + self.js_windows_common + self.sulong_windows + java_deps(edition) + (if (java_version == 'latest') then self.svm_common_windows_amd64("Latest") else self.svm_common_windows_amd64(java_version)) + self.js_windows_common + self.sulong_windows else error 'Unknown windows arch: ' + arch else diff --git a/vm/ci/ci_includes/vm-native.jsonnet b/vm/ci/ci_includes/vm-native.jsonnet index b6e65a94b4a3..2599c31df717 100644 --- a/vm/ci/ci_includes/vm-native.jsonnet +++ b/vm/ci/ci_includes/vm-native.jsonnet @@ -47,7 +47,7 @@ local vm_common = import '../ci_common/common.jsonnet'; }, 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.vm_base('linux', 'amd64', 'gate') + { + vm.vm_java_Latest + vm_common.svm_common_linux_amd64 + vm_common.sulong_linux + vm_common.graalpython_linux_amd64 + vm.custom_vm_linux + vm_common.vm_base('linux', 'amd64', 'gate') + { run+: [ ['export', 'SVM_SUITE=' + vm.svm_suite], ['mx', '--dynamicimports', '$SVM_SUITE,graalpython', '--disable-polyglot', '--disable-libpolyglot', '--force-bash-launchers=lli,native-image', 'gate', '--no-warning-as-error', '--tags', 'build,python'], diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet index 3ef2711f1f1b..e1098d37384d 100644 --- a/vm/ci/ci_includes/vm.jsonnet +++ b/vm/ci/ci_includes/vm.jsonnet @@ -99,21 +99,21 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; }, local builds = [ - utils.add_gate_predicate(self.vm_java_21 + vm_common.vm_base('linux', 'amd64', 'gate') + { + utils.add_gate_predicate(self.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + { run: [ ['mx', 'build'], ['mx', 'unittest', '--suite', 'vm'], ], name: 'gate-vm-unittest-linux-amd64', }, ['sdk', 'truffle', 'vm']), - utils.add_gate_predicate(self.vm_java_21 + graal_common.devkits['windows-jdk21'] + vm_common.vm_base('windows', 'amd64', 'gate') + { + utils.add_gate_predicate(self.vm_java_Latest + graal_common.devkits['windows-jdkLatest'] + vm_common.vm_base('windows', 'amd64', 'gate') + { run: [ ['mx', 'build'], ['mx', 'unittest', '--suite', 'vm'], ], name: 'gate-vm-unittest-windows-amd64', }, ["sdk", "truffle", "vm"]), - self.vm_java_21 + vm_common.vm_base('linux', 'amd64', 'gate') + vm_common.sulong_linux + { + self.vm_java_Latest + vm_common.vm_base('linux', 'amd64', 'gate') + vm_common.sulong_linux + { environment+: { DYNAMIC_IMPORTS: '/tools,/substratevm,/sulong', NATIVE_IMAGES: 'polyglot', @@ -170,7 +170,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; name: 'gate-vm-maven-dry-run-windows-amd64', timelimit: '1:00:00', }, - vm_common.graalvm_complete_build_deps('ce', 'windows', 'amd64', java_version='latest') + vm_common.deploy_build + vm_common.vm_base('windows', 'amd64', 'daily', deploy=true, jdk_hint='21') + vm_common.maven_deploy_base_functions.base_object('windows', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { + vm_common.graalvm_complete_build_deps('ce', 'windows', 'amd64', java_version='latest') + vm_common.deploy_build + vm_common.vm_base('windows', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('windows', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { name: 'daily-deploy-vm-maven-windows-amd64', timelimit: '1:00:00', notify_groups:: ['deploy'],