From 456766124e128fcdcccefe1f4af1185a81e30c15 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Fri, 16 Feb 2024 18:04:32 +0100 Subject: [PATCH] Deploy the Espresso standalones only weekly. Also, not as a dev build. --- vm/ce-release-artifacts.json | 33 --------------------------------- vm/ci/ci_common/common.jsonnet | 10 +++++----- vm/ci/ci_includes/vm.jsonnet | 5 ----- 3 files changed, 5 insertions(+), 43 deletions(-) diff --git a/vm/ce-release-artifacts.json b/vm/ce-release-artifacts.json index 3a3d2b463b30..44c130c404ff 100644 --- a/vm/ce-release-artifacts.json +++ b/vm/ce-release-artifacts.json @@ -358,38 +358,5 @@ "name_template": "{name}-community-jvm-{version}-{os}-{arch}" } ] - }, - { - "name": "graalvm-espresso-community-java21", - "core": true, - "jdk": "jdk_21", - "override_name":"espresso", - "artifacts": [ - { - "os": "linux", - "arch": "amd64", - "name_template": "{name}-community-{version}-{os}-{arch}" - }, - { - "os": "linux", - "arch": "aarch64", - "name_template": "{name}-community-{version}-{os}-{arch}" - }, - { - "os": "darwin", - "arch": "amd64", - "name_template": "{name}-community-{version}-macos-{arch}" - }, - { - "os": "darwin", - "arch": "aarch64", - "name_template": "{name}-community-{version}-macos-{arch}" - }, - { - "os": "windows", - "arch": "amd64", - "name_template": "{name}-community-{version}-{os}-{arch}" - } - ] } ] diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet index 383aefa099b0..a1747e562036 100644 --- a/vm/ci/ci_common/common.jsonnet +++ b/vm/ci/ci_common/common.jsonnet @@ -681,11 +681,11 @@ local devkits = graal_common.devkits; # Deploy the GraalVM Espresso artifact (GraalVM Base + espresso - native image) # - deploy_vm_espresso_java21_linux_amd64: vm.vm_java_21_llvm + self.full_vm_build_linux_amd64 + self.linux_deploy + self.vm_base('linux', 'amd64', 'daily', deploy=true) + self.deploy_graalvm_espresso('linux', 'amd64', 'java21') + {name: 'daily-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.vm_base('linux', 'aarch64', 'daily', deploy=true) + self.deploy_graalvm_espresso('linux', 'aarch64', 'java21') + {name: 'daily-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.vm_base('darwin', 'amd64', 'daily', deploy=true) + self.deploy_graalvm_espresso('darwin', 'amd64', 'java21') + {name: 'daily-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.vm_base('darwin', 'aarch64', 'daily', deploy=true) + self.deploy_graalvm_espresso('darwin', 'aarch64', 'java21') + {name: 'daily-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.vm_base('windows', 'amd64', 'daily', deploy=true, jdk_hint='21') + self.deploy_graalvm_espresso('windows', 'amd64', 'java21') + {name: 'daily-deploy-vm-espresso-java21-windows-amd64', notify_groups:: ["deploy"]}, + deploy_vm_espresso_java21_linux_amd64: vm.vm_java_21_llvm + self.full_vm_build_linux_amd64 + self.linux_deploy + self.vm_base('linux', 'amd64', 'weekly', deploy=true) + self.deploy_graalvm_espresso('linux', 'amd64', 'java21') + {name: 'weekly-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.vm_base('linux', 'aarch64', 'weekly', deploy=true) + self.deploy_graalvm_espresso('linux', 'aarch64', 'java21') + {name: 'weekly-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.vm_base('darwin', 'amd64', 'weekly', deploy=true) + self.deploy_graalvm_espresso('darwin', 'amd64', 'java21') + {name: 'weekly-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.vm_base('darwin', 'aarch64', 'weekly', deploy=true) + self.deploy_graalvm_espresso('darwin', 'aarch64', 'java21') + {name: 'weekly-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.vm_base('windows', 'amd64', 'weekly', deploy=true, jdk_hint='21') + self.deploy_graalvm_espresso('windows', 'amd64', 'java21') + {name: 'weekly-deploy-vm-espresso-java21-windows-amd64', notify_groups:: ["deploy"]}, local sulong_vm_tests = self.svm_common_linux_amd64 + self.sulong_linux + vm.custom_vm_linux + self.vm_base('linux', 'amd64', 'gate') + { run: [ diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet index 0a1045fb4a5f..4d398fbf0796 100644 --- a/vm/ci/ci_includes/vm.jsonnet +++ b/vm/ci/ci_includes/vm.jsonnet @@ -62,11 +62,6 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; 'daily-deploy-vm-base-java-latest-windows-amd64', 'daily-deploy-vm-standalones-java-latest-windows-amd64', 'daily-deploy-vm-maven-linux-amd64', - 'daily-deploy-vm-espresso-java21-linux-amd64', - 'daily-deploy-vm-espresso-java21-linux-aarch64', - 'daily-deploy-vm-espresso-java21-darwin-amd64', - 'daily-deploy-vm-espresso-java21-darwin-aarch64', - 'daily-deploy-vm-espresso-java21-windows-amd64', ], notify_groups:: ['deploy'], },