[GR-54027] Updated Maven LTS compatibility gates to graalvm-23.1.3.

PullRequest: graal/17723
oracle · May 20, 2024 · 80f89c9 · 80f89c9
2 parents a25a7b6 + e112d44
commit 80f89c9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ci/common.jsonnet b/ci/common.jsonnet
@@ -60,6 +60,8 @@ local common_json = import "../common.json";
  } + {
  [name]: jdk_base + common_json.jdks[name] + { jdk_version:: parse_labsjdk_version(self), jdk_name:: "jdk-latest"}
  for name in ["oraclejdk-latest"] + variants("labsjdk-ce-latest") + variants("labsjdk-ee-latest")
+ } + {
+ 'graalvm-ee-21': jdk_base + common_json.jdks["graalvm-ee-21"] + { jdk_version:: 21 },
  },
  # We do not want to expose galahad-jdk
  assert std.assertEqual([x for x in std.objectFields(common_json.jdks) if x != "galahad-jdk"], std.objectFields(jdks_data)),

diff --git a/common.json b/common.json
@@ -43,6 +43,7 @@
  "labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33", "platformspecific": true },
  "labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-debug", "platformspecific": true },
  "labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.2+13-jvmci-23.1-b33-sulong", "platformspecific": true },
+ "graalvm-ee-21": {"name": "graalvm-java21", "version": "23.1.3", "platformspecific": true },
 
  "oraclejdk-latest": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+22", "platformspecific": true, "extrabundles": ["static-libs"]},
  "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-23+22-jvmci-b01", "platformspecific": true },

diff --git a/vm/ci/ci_includes/vm-native.jsonnet b/vm/ci/ci_includes/vm-native.jsonnet
@@ -1,6 +1,7 @@
 local utils = import '../../../ci/ci_common/common-utils.libsonnet';
 local vm = import 'vm.jsonnet';
 local vm_common = import '../ci_common/common.jsonnet';
+local graal_common = import '../../../ci/ci_common/common.jsonnet';
 
 {
  local truffle_jvm = vm_common.svm_common + {
@@ -21,10 +22,7 @@ local vm_common = import '../ci_common/common.jsonnet';
  name: self.targets[0] + '-vm-ce-truffle-native' + self.gate_tag_suffix + '-labs' + self.jdk_name + '-linux-amd64',
  },
 
- local truffle_lts_compatibility(mode) = vm_common.svm_common {
- downloads+: {
- JAVA_HOME: { name: 'graalvm-java21', version: '23.1.2', platformspecific: true },
- },
+ local truffle_lts_compatibility(mode) = vm_common.svm_common + graal_common['graalvm-ee-21'] {
  environment+: {
  JVMCI_VERSION_CHECK: 'warn',
  },