[GR-68010] Run only deploy jobs on BigSur.

PullRequest: graal/21616

Author: ansalond

vm/ci/ci_common/common-runspec.jsonnet

@@ -87,7 +87,7 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
         LANG: 'en_US.UTF-8',
         MACOSX_DEPLOYMENT_TARGET: '11.0',  # for compatibility with macOS BigSur
       },
-      capabilities+: ['darwin_bigsur', 'ram16gb'],
+      capabilities+: ['ram16gb'],
     },
 
     local common_vm_windows = common_vm + graal_common.windows_server_2016_amd64,
@@ -226,8 +226,8 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
     "vm-base": mx_env + deploy_graalvm_base + default_os_arch_jdk_mixin + platform_spec(no_jobs) + platform_spec({
       "linux:amd64:jdk-latest": post_merge,
       "linux:aarch64:jdk-latest": daily + capabilities('!xgene3') + timelimit('1:30:00'),
-      "darwin:amd64:jdk-latest": daily,
-      "darwin:aarch64:jdk-latest": daily + timelimit('1:45:00') + notify_emails('[email protected]'),
+      "darwin:amd64:jdk-latest": daily + capabilities('darwin_bigsur'),
+      "darwin:aarch64:jdk-latest": daily + capabilities('darwin_bigsur') + timelimit('1:45:00') + notify_emails('[email protected]'),
       "windows:amd64:jdk-latest": daily + timelimit('1:30:00'),
     }),
   },
@@ -240,8 +240,8 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
     if vm.deploy_espress_standalone then platform_spec({
       "linux:amd64:jdk-latest": daily,
       "linux:aarch64:jdk-latest": weekly,
-      "darwin:amd64:jdk-latest": weekly,
-      "darwin:aarch64:jdk-latest": weekly,
+      "darwin:amd64:jdk-latest": weekly + capabilities('darwin_bigsur'),
+      "darwin:aarch64:jdk-latest": weekly + capabilities('darwin_bigsur'),
       "windows:amd64:jdk-latest": weekly,
     }) else {}),
     "vm-espresso-g1": mx_env + deploy_graalvm_espresso(with_g1=true) + espresso_java_home(25) + default_os_arch_jdk_mixin + platform_spec(no_jobs) + (

vm/ci/ci_common/common.jsonnet

@@ -93,7 +93,7 @@ local devkits = graal_common.devkits;
   vm_ol9_aarch64: self.vm_linux_aarch64_ol9,
 
   vm_darwin_amd64: self.common_vm_darwin + graal_common.darwin_amd64 + {
-    capabilities+: ['darwin_bigsur', 'ram16gb'],
+    capabilities+: ['ram16gb'],
     packages+: {
       gcc: '==4.9.2',
     },
@@ -106,7 +106,6 @@ local devkits = graal_common.devkits;
   vm_darwin_amd64_jdkLatest: self.vm_darwin_amd64,
 
   vm_darwin_aarch64: self.common_vm_darwin + graal_common.darwin_aarch64 + {
-    capabilities+: ['darwin_bigsur'],
     environment+: {
       # for compatibility with macOS BigSur
       MACOSX_DEPLOYMENT_TARGET: '11.0',
@@ -559,9 +558,9 @@ local devkits = graal_common.devkits;
   # Linux/AARCH64
   deploy_vm_standalones_javaLatest_linux_aarch64: vm.vm_java_Latest + self.full_vm_build + self.linux_deploy + self.vm_base('linux', 'aarch64', 'daily', deploy=true) + self.deploy_graalvm_standalones('latest') + {name: 'daily-deploy-vm-standalones-java-latest-linux-aarch64', notify_groups:: ["deploy"], capabilities+: ["!xgene3"]},
   # Darwin/AMD64
-  deploy_vm_standalones_javaLatest_darwin_amd64: vm.vm_java_Latest + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + self.deploy_graalvm_standalones('latest') + {name: 'daily-deploy-vm-standalones-java-latest-darwin-amd64', capabilities+: ["!macmini_late_2014"], notify_groups:: ["deploy"], timelimit: '3:00:00'},
+  deploy_vm_standalones_javaLatest_darwin_amd64: vm.vm_java_Latest + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + self.deploy_graalvm_standalones('latest') + {name: 'daily-deploy-vm-standalones-java-latest-darwin-amd64', capabilities+: ["darwin_bigsur", "!macmini_late_2014"], notify_groups:: ["deploy"], timelimit: '3:00:00'},
   # Darwin/AARCH64
-  deploy_vm_standalones_javaLatest_darwin_aarch64: vm.vm_java_Latest + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'aarch64', 'daily', deploy=true) + self.deploy_graalvm_standalones('latest') + {name: 'daily-deploy-vm-standalones-java-latest-darwin-aarch64', notify_groups:: ["deploy"], notify_emails+: ["[email protected]"], timelimit: '3:00:00'},
+  deploy_vm_standalones_javaLatest_darwin_aarch64: vm.vm_java_Latest + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'aarch64', 'daily', deploy=true) + self.deploy_graalvm_standalones('latest') + {name: 'daily-deploy-vm-standalones-java-latest-darwin-aarch64', capabilities+: ["darwin_bigsur"], notify_groups:: ["deploy"], notify_emails+: ["[email protected]"], timelimit: '3:00:00'},
   # Windows/AMD64
   deploy_vm_standalones_javaLatest_windows_amd64: vm.vm_java_Latest + self.svm_common_windows_amd64('Latest') + self.js_windows_common + graal_common.deps.sulong + self.vm_base('windows', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + self.deploy_graalvm_standalones('latest') + self.deploy_build + {name: 'daily-deploy-vm-standalones-java-latest-windows-amd64', timelimit: '2:30:00', notify_groups:: ["deploy"]},
 

vm/ci/ci_includes/vm.jsonnet

@@ -135,16 +135,19 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
     # We do not have a gate that executes a dry-run of Maven deployment for darwin/amd64. We just rely on the daily job defined below.
     vm_common.graalvm_complete_build_deps('ce', 'darwin', 'amd64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('darwin', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
       name: 'daily-deploy-vm-maven-darwin-amd64',
+      capabilities+: ['darwin_bigsur'],
       timelimit: '1:00:00',
       notify_groups:: ['deploy'],
     },
     # Darwin/AARCH64
     vm_common.graalvm_complete_build_deps('ce', 'darwin', 'aarch64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'aarch64', 'gate') + vm_common.maven_deploy_base_functions.base_object('darwin', 'aarch64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
       name: 'gate-vm-maven-dry-run-darwin-aarch64',
+      capabilities+: ['darwin_bigsur'],
       timelimit: '1:00:00',
     },
     vm_common.graalvm_complete_build_deps('ce', 'darwin', 'aarch64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'aarch64', 'daily', deploy=true) + vm_common.maven_deploy_base_functions.base_object('darwin', 'aarch64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + {
       name: 'daily-deploy-vm-maven-darwin-aarch64',
+      capabilities+: ['darwin_bigsur'],
       timelimit: '1:00:00',
       notify_groups:: ['deploy'],
     },