-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[GR-48742] [GR-48754] Improve deployment of artifacts.
PullRequest: graal/15618
- Loading branch information
Showing
5 changed files
with
115 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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": "f85c63d782782fc566bd661a1d638f8f9bb65b2e" | ||
| "overlay": "f197d31e391f68e62e7b7897e8e161b50e5e880d" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -724,12 +724,6 @@ local devkits = graal_common.devkits; | |
| record_file_sizes:: ['benchmark', 'file-size:*', '--results-file', 'sizes.json'], | ||
| upload_file_sizes:: ['bench-uploader.py', 'sizes.json'], | ||
|
|
||
| # These dummy artifacts are required by notify_releaser_build in order to trigger the releaser service | ||
| # after the deploy jobs have completed. | ||
| create_releaser_notifier_artifact:: [ | ||
| ['python3', '-c', "from os import environ; open('../' + environ['BUILD_NAME'], 'a').close()"], | ||
| ], | ||
|
|
||
| build_base_graalvm_image: [ | ||
| $.mx_vm_common + vm.vm_profiles + ['graalvm-show'], | ||
| $.mx_vm_common + vm.vm_profiles + ['build'], | ||
|
|
@@ -772,20 +766,34 @@ local devkits = graal_common.devkits; | |
| run: $.patch_env(self.os, self.arch, java_version) + vm.collect_profiles() + $.build_base_graalvm_image + [ | ||
| $.mx_vm_common + vm.vm_profiles + $.record_file_sizes, | ||
| $.upload_file_sizes, | ||
| ] + $.deploy_sdk_base(self.os) + $.create_releaser_notifier_artifact + $.check_base_graalvm_image(self.os, self.arch, java_version), | ||
| ] + $.deploy_sdk_base(self.os) + $.check_base_graalvm_image(self.os, self.arch, java_version), | ||
| notify_groups:: ['deploy'], | ||
| timelimit: "1:00:00" | ||
| }, | ||
|
|
||
| deploy_graalvm_components(java_version, tags): vm.check_structure + { | ||
| deploy_graalvm_components(java_version, installables, standalones, record_file_sizes=false): vm.check_structure + { | ||
| build_deps:: std.join(',', [] | ||
| + (if (record_file_sizes) then ['GRAALVM'] else []) | ||
| + (if (installables) then ['GRAALVM_INSTALLABLES'] else []) | ||
| + (if (standalones) then ['GRAALVM_STANDALONES'] else []) | ||
| ), | ||
|
|
||
| tags:: std.join(',', [] | ||
| + (if (installables) then ['installable'] else []) | ||
| + (if (standalones) then ['standalone'] else []) | ||
| ), | ||
|
|
||
| run: $.patch_env(self.os, self.arch, java_version) + [ | ||
| $.mx_vm_installables + ['graalvm-show'], | ||
| $.mx_vm_installables + ['build', '--dependencies', 'ALL_GRAALVM_ARTIFACTS'], | ||
| ['set-export', 'GRAALVM_HOME', $.mx_vm_installables + ['--quiet', '--no-warning', 'graalvm-home']], | ||
| ] + $.deploy_sdk_components(self.os, tags) + [ | ||
| $.mx_vm_installables + $.record_file_sizes, | ||
| $.upload_file_sizes, | ||
| ] + $.create_releaser_notifier_artifact + vm.check_graalvm_complete_build($.mx_vm_installables, self.os, self.arch, java_version), | ||
| $.mx_vm_installables + ['build', '--dependencies', self.build_deps], | ||
| ] | ||
| + $.deploy_sdk_components(self.os, self.tags) | ||
| + ( | ||
| if (record_file_sizes) then [ | ||
| $.mx_vm_installables + $.record_file_sizes, | ||
| $.upload_file_sizes, | ||
| ] else [] | ||
| ), | ||
| notify_groups:: ['deploy'], | ||
| timelimit: "1:30:00" | ||
| }, | ||
|
|
@@ -801,7 +809,7 @@ local devkits = graal_common.devkits; | |
| ['set-export', 'GRAALVM_HOME', $.mx_vm_common + ['--quiet', '--no-warning', 'graalvm-home']], | ||
| ['set-export', 'DACAPO_JAR', $.mx_vm_common + ['--quiet', '--no-warning', 'paths', '--download', 'DACAPO_MR1_2baec49']], | ||
| ['${GRAALVM_HOME}/bin/java', '-jar', '${DACAPO_JAR}', 'luindex'], | ||
| ] + $.create_releaser_notifier_artifact, | ||
| ], | ||
| notify_groups:: ['deploy'], | ||
| timelimit: '1:45:00', | ||
| }, | ||
|
|
@@ -813,25 +821,25 @@ local devkits = graal_common.devkits; | |
|
|
||
| # Linux/AMD64 | ||
| deploy_vm_base_java21_linux_amd64: vm.vm_java_21_llvm + self.full_vm_build_linux_amd64 + self.linux_deploy + self.deploy_vm_linux_amd64 + self.deploy_graalvm_base("java21") + {name: 'post-merge-deploy-vm-base-java21-linux-amd64', diskspace_required: vm.diskspace_required.java21_linux_amd64, notify_groups:: ["deploy"]}, | ||
| deploy_vm_installables_standalones_java21_linux_amd64: vm.vm_java_21_llvm + self.full_vm_build_linux_amd64 + self.linux_deploy + self.deploy_daily_vm_linux_amd64 + self.deploy_graalvm_components("java21", "installable,standalone") + {name: 'daily-deploy-vm-installables-standalones-java21-linux-amd64', diskspace_required: vm.diskspace_required.java21_linux_amd64, notify_groups:: ["deploy"]}, | ||
| deploy_vm_installables_standalones_java21_linux_amd64: vm.vm_java_21_llvm + self.full_vm_build_linux_amd64 + self.linux_deploy + self.deploy_daily_vm_linux_amd64 + self.deploy_graalvm_components("java21", installables=true, standalones=true, record_file_sizes=true) + {name: 'daily-deploy-vm-installables-standalones-java21-linux-amd64', diskspace_required: vm.diskspace_required.java21_linux_amd64, notify_groups:: ["deploy"]}, | ||
| # Linux/AARCH64 | ||
| deploy_vm_base_java21_linux_aarch64: vm.vm_java_21 + self.full_vm_build_linux_aarch64 + self.linux_deploy + self.deploy_daily_vm_linux_aarch64 + self.deploy_graalvm_base("java21") + {name: 'daily-deploy-vm-base-java21-linux-aarch64', notify_groups:: ["deploy"], timelimit: '1:30:00', capabilities+: ["!xgene3"]}, | ||
| deploy_vm_installables_standalones_java21_linux_aarch64: vm.vm_java_21 + self.full_vm_build_linux_aarch64 + self.linux_deploy + self.deploy_daily_vm_linux_aarch64 + self.deploy_graalvm_components("java21", "installable,standalone") + {name: 'daily-deploy-vm-installables-standalones-java21-linux-aarch64', notify_groups:: ["deploy"], capabilities+: ["!xgene3"]}, | ||
| deploy_vm_installables_standalones_java21_linux_aarch64: vm.vm_java_21 + self.full_vm_build_linux_aarch64 + self.linux_deploy + self.deploy_daily_vm_linux_aarch64 + self.deploy_graalvm_components("java21", installables=true, standalones=true) + {name: 'daily-deploy-vm-installables-standalones-java21-linux-aarch64', notify_groups:: ["deploy"], capabilities+: ["!xgene3"]}, | ||
|
|
||
| # Darwin/AMD64 | ||
| deploy_vm_base_java21_darwin_amd64: vm.vm_java_21_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_daily_vm_darwin_amd64 + self.deploy_graalvm_base("java21") + {name: 'daily-deploy-vm-base-java21-darwin-amd64', notify_groups:: ["deploy"], timelimit: '1:45:00'}, | ||
| deploy_vm_installables_java21_darwin_amd64: vm.vm_java_21_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_weekly_vm_darwin_amd64 + self.deploy_graalvm_components("java21", "installable") + {name: 'weekly-deploy-vm-installables-java21-darwin-amd64', diskspace_required: "31GB", notify_groups:: ["deploy"], timelimit: '3:00:00'}, | ||
| deploy_vm_standalones_java21_darwin_amd64: vm.vm_java_21_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_daily_vm_darwin_amd64 + self.deploy_graalvm_components("java21", "standalone") + {name: 'daily-deploy-vm-standalones-java21-darwin-amd64', diskspace_required: "31GB", notify_groups:: ["deploy"], timelimit: '3:00:00'}, | ||
| deploy_vm_installables_java21_darwin_amd64: vm.vm_java_21_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_weekly_vm_darwin_amd64 + self.deploy_graalvm_components("java21", installables=true, standalones=false) + {name: 'weekly-deploy-vm-installables-java21-darwin-amd64', diskspace_required: "31GB", notify_groups:: ["deploy"], timelimit: '3:00:00'}, | ||
| deploy_vm_standalones_java21_darwin_amd64: vm.vm_java_21_llvm + self.full_vm_build_darwin_amd64 + self.darwin_deploy + self.deploy_daily_vm_darwin_amd64 + self.deploy_graalvm_components("java21", installables=false, standalones=true) + {name: 'daily-deploy-vm-standalones-java21-darwin-amd64', diskspace_required: "31GB", notify_groups:: ["deploy"], timelimit: '3:00:00'}, | ||
|
|
||
| # Darwin/AARCH64 | ||
| deploy_vm_base_java21_darwin_aarch64: vm.vm_java_21 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_daily_vm_darwin_aarch64 + self.deploy_graalvm_base("java21") + {name: 'daily-deploy-vm-base-java21-darwin-aarch64', notify_groups:: ["deploy"], notify_emails+: ["[email protected]"], timelimit: '1:45:00'}, | ||
| deploy_vm_installables_java21_darwin_aarch64: vm.vm_java_21 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_weekly_vm_darwin_aarch64 + self.deploy_graalvm_components("java21", "installable") + {name: 'weekly-deploy-vm-installables-java21-darwin-aarch64', diskspace_required: "31GB", notify_groups:: ["deploy"], notify_emails+: ["[email protected]"], timelimit: '3:00:00'}, | ||
| deploy_vm_standalones_java21_darwin_aarch64: vm.vm_java_21 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_daily_vm_darwin_aarch64 + self.deploy_graalvm_components("java21", "standalone") + {name: 'daily-deploy-vm-standalones-java21-darwin-aarch64', diskspace_required: "31GB", notify_groups:: ["deploy"], notify_emails+: ["[email protected]"], timelimit: '3:00:00'}, | ||
| deploy_vm_installables_java21_darwin_aarch64: vm.vm_java_21 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_weekly_vm_darwin_aarch64 + self.deploy_graalvm_components("java21", installables=true, standalones=false) + {name: 'weekly-deploy-vm-installables-java21-darwin-aarch64', diskspace_required: "31GB", notify_groups:: ["deploy"], notify_emails+: ["[email protected]"], timelimit: '3:00:00'}, | ||
| deploy_vm_standalones_java21_darwin_aarch64: vm.vm_java_21 + self.full_vm_build_darwin_aarch64 + self.darwin_deploy + self.deploy_daily_vm_darwin_aarch64 + self.deploy_graalvm_components("java21", installables=false, standalones=true) + {name: 'daily-deploy-vm-standalones-java21-darwin-aarch64', diskspace_required: "31GB", notify_groups:: ["deploy"], notify_emails+: ["[email protected]"], timelimit: '3:00:00'}, | ||
|
|
||
| # Windows/AMD64 | ||
| deploy_vm_base_java21_windows_amd64: vm.vm_java_21 + self.svm_common_windows_amd64("21") + self.js_windows_jdk21 + self.deploy_daily_vm_windows_jdk21 + self.deploy_graalvm_base("java21") + self.deploy_build + {name: 'daily-deploy-vm-base-java21-windows-amd64', notify_groups:: ["deploy"], timelimit: '1:30:00'}, | ||
| deploy_vm_installables_java21_windows_amd64: vm.vm_java_21 + self.svm_common_windows_amd64("21") + self.js_windows_jdk21 + self.sulong_windows + self.deploy_weekly_vm_windows_jdk21 + self.deploy_graalvm_components("java21", "installable") + self.deploy_build + {name: 'weekly-deploy-vm-installables-java21-windows-amd64', diskspace_required: "31GB", timelimit: '2:30:00', notify_groups:: ["deploy"]}, | ||
| deploy_vm_standalones_java21_windows_amd64: vm.vm_java_21 + self.svm_common_windows_amd64("21") + self.js_windows_jdk21 + self.sulong_windows + self.deploy_daily_vm_windows_jdk21 + self.deploy_graalvm_components("java21", "standalone") + self.deploy_build + {name: 'daily-deploy-vm-standalones-java21-windows-amd64', diskspace_required: "31GB", timelimit: '2:30:00', notify_groups:: ["deploy"]}, | ||
| deploy_vm_installables_java21_windows_amd64: vm.vm_java_21 + self.svm_common_windows_amd64("21") + self.js_windows_jdk21 + self.sulong_windows + self.deploy_weekly_vm_windows_jdk21 + self.deploy_graalvm_components("java21", installables=true, standalones=false) + self.deploy_build + {name: 'weekly-deploy-vm-installables-java21-windows-amd64', diskspace_required: "31GB", timelimit: '2:30:00', notify_groups:: ["deploy"]}, | ||
| deploy_vm_standalones_java21_windows_amd64: vm.vm_java_21 + self.svm_common_windows_amd64("21") + self.js_windows_jdk21 + self.sulong_windows + self.deploy_daily_vm_windows_jdk21 + self.deploy_graalvm_components("java21", installables=false, standalones=true) + self.deploy_build + {name: 'daily-deploy-vm-standalones-java21-windows-amd64', diskspace_required: "31GB", timelimit: '2:30:00', notify_groups:: ["deploy"]}, | ||
|
|
||
| # | ||
| # Deploy the GraalVM Espresso artifact (GraalVM Base + espresso - native image) | ||
|
|
||
Oops, something went wrong.