diff --git a/ci/ci_common/ci-resources.libsonnet b/ci/ci_common/ci-resources.libsonnet index 85f41644da44..546f3b02e314 100644 --- a/ci/ci_common/ci-resources.libsonnet +++ b/ci/ci_common/ci-resources.libsonnet @@ -4,6 +4,7 @@ ol8_bench_image: "", benchmarking_config_repo: "", notify_releaser_service: [""], + notify_indexer_service(java_version, edition): [""], nexus_base_url: "" } } diff --git a/graal-common.json b/graal-common.json index 74829d44cdc4..bda7d857a3a8 100644 --- a/graal-common.json +++ b/graal-common.json @@ -1,6 +1,6 @@ { "README": "This file contains definitions that are useful for the jsonnet CI files of the graal and graal-enterprise repositories.", "ci": { - "overlay": "9d1b45fd53173902c5a3f451d20cc6c02f24025a" + "overlay": "012d4a64c862f376e77663df257f29f37c700344" } } diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet index cee0c99f183f..1ef33bdf662a 100644 --- a/vm/ci/ci_includes/vm.jsonnet +++ b/vm/ci/ci_includes/vm.jsonnet @@ -39,14 +39,15 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; ], }, - notify_releaser_build: vm_common.vm_base('linux', 'amd64', 'daily', deploy=true) + { - name: 'daily-deploy-vm-notify-releaser-build-linux-amd64', + vm_notifier_daily: vm_common.vm_base('linux', 'amd64', 'daily', deploy=true) + { + name: 'daily-deploy-vm-notifier-linux-amd64', packages+: { curl: '>=7.50.1', git: '>=1.8.3', }, run+: [ - ['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'master', '||'] + self.ci_resources.infra.notify_releaser_service, + ['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'master', '||'] + self.ci_resources.infra.notify_releaser_service, + ['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'master', '||'] + self.ci_resources.infra.notify_indexer_service('java-latest', 'ce'), ], runAfter: [ 'post-merge-deploy-vm-base-java-latest-linux-amd64', @@ -64,6 +65,31 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; notify_groups:: ['deploy'], }, + vm_notifier_weekly: vm_common.vm_base('linux', 'amd64', 'weekly', deploy=true) + { + name: 'weekly-deploy-vm-notifier-linux-amd64', + packages+: { + curl: '>=7.50.1', + git: '>=1.8.3', + }, + run+: [ + ['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'master', '||'] + self.ci_resources.infra.notify_indexer_service('java21', 'ce'), + ], + runAfter: [ + 'daily-deploy-vm-maven-linux-amd64', + 'weekly-deploy-vm-base-java21-darwin-aarch64', + 'weekly-deploy-vm-base-java21-darwin-amd64', + 'weekly-deploy-vm-base-java21-linux-aarch64', + 'weekly-deploy-vm-base-java21-linux-amd64', + 'weekly-deploy-vm-base-java21-windows-amd64', + 'weekly-deploy-vm-standalones-java21-darwin-aarch64', + 'weekly-deploy-vm-standalones-java21-darwin-amd64', + 'weekly-deploy-vm-standalones-java21-linux-aarch64', + 'weekly-deploy-vm-standalones-java21-linux-amd64', + 'weekly-deploy-vm-standalones-java21-windows-amd64', + ], + notify_groups:: ['deploy'], + }, + default_diskspace_required(os, arch, large): { # `os` and `arch` are not yet used 'diskspace_required': if (large) then '30GB' else '25GB', @@ -232,8 +258,9 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; vm_common.deploy_vm_espresso_java21_darwin_aarch64, vm_common.deploy_vm_espresso_java21_windows_amd64, - # Trigger the releaser service - self.notify_releaser_build, + # Trigger the releaser service and notify the indexer + self.vm_notifier_daily, + self.vm_notifier_weekly, ], builds: [vm_common.verify_name(b) for b in vm_common.builds + vm_common_bench.builds + vm_bench.builds + vm_native.builds + utils.add_defined_in(builds, std.thisFile)],