From a23ae256e54aad35d103828a97fbb683706c47fa Mon Sep 17 00:00:00 2001 From: Hachim Hassani Lahsinui Date: Fri, 8 Mar 2024 17:33:40 +0100 Subject: [PATCH 1/4] invoke revision registry endpoint --- ci/ci_common/ci-resources.libsonnet | 1 + graal-common.json | 2 +- vm/ci/ci_includes/vm.jsonnet | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/ci_common/ci-resources.libsonnet b/ci/ci_common/ci-resources.libsonnet index 85f41644da44..562e635feab8 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: [""], nexus_base_url: "" } } diff --git a/graal-common.json b/graal-common.json index 74829d44cdc4..c9fee6cedde5 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": "18b2edc8b7e433b007defc97729a766ad1917708" } } diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet index cee0c99f183f..151ea5be0396 100644 --- a/vm/ci/ci_includes/vm.jsonnet +++ b/vm/ci/ci_includes/vm.jsonnet @@ -46,7 +46,8 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; 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, ], runAfter: [ 'post-merge-deploy-vm-base-java-latest-linux-amd64', From 8ffd534f8debe1910e3744fb87db91edca75e919 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 18 Mar 2024 19:33:57 +0100 Subject: [PATCH 2/4] Use new indexer endpoint. --- ci/ci_common/ci-resources.libsonnet | 2 +- graal-common.json | 2 +- vm/ci/ci_includes/vm.jsonnet | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/ci_common/ci-resources.libsonnet b/ci/ci_common/ci-resources.libsonnet index 562e635feab8..546f3b02e314 100644 --- a/ci/ci_common/ci-resources.libsonnet +++ b/ci/ci_common/ci-resources.libsonnet @@ -4,7 +4,7 @@ ol8_bench_image: "", benchmarking_config_repo: "", notify_releaser_service: [""], - notify_indexer_service: [""], + notify_indexer_service(java_version, edition): [""], nexus_base_url: "" } } diff --git a/graal-common.json b/graal-common.json index c9fee6cedde5..4178b6e18a00 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": "18b2edc8b7e433b007defc97729a766ad1917708" + "overlay": "951b692c2cfdb85e5d2a53996965858051b6c46f" } } diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet index 151ea5be0396..0007ed802e7d 100644 --- a/vm/ci/ci_includes/vm.jsonnet +++ b/vm/ci/ci_includes/vm.jsonnet @@ -39,15 +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', + notify_releaser_indexer: vm_common.vm_base('linux', 'amd64', 'daily', deploy=true) + { + name: 'daily-deploy-vm-notify-releaser-indexer-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_indexer_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', @@ -234,7 +234,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; vm_common.deploy_vm_espresso_java21_windows_amd64, # Trigger the releaser service - self.notify_releaser_build, + self.notify_releaser_indexer, ], 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)], From 9eb7d8e3a513928dc2989972730507eed7830b8f Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Mon, 18 Mar 2024 19:49:57 +0100 Subject: [PATCH 3/4] Notify the indexer also about weekly artifacts. --- vm/ci/ci_includes/vm.jsonnet | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet index 0007ed802e7d..1ef33bdf662a 100644 --- a/vm/ci/ci_includes/vm.jsonnet +++ b/vm/ci/ci_includes/vm.jsonnet @@ -39,8 +39,8 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; ], }, - notify_releaser_indexer: vm_common.vm_base('linux', 'amd64', 'daily', deploy=true) + { - name: 'daily-deploy-vm-notify-releaser-indexer-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', @@ -65,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', @@ -233,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_indexer, + # 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)], From e3a7151eb3c5f1ea3d6080e5be6466d7db746774 Mon Sep 17 00:00:00 2001 From: Hachim Hassani Lahsinui Date: Tue, 19 Mar 2024 16:27:15 +0000 Subject: [PATCH 4/4] Updated overlays revision. --- graal-common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graal-common.json b/graal-common.json index 4178b6e18a00..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": "951b692c2cfdb85e5d2a53996965858051b6c46f" + "overlay": "012d4a64c862f376e77663df257f29f37c700344" } }