[GR-42486] Migrate remaining JDK11 gates to JDK17.

PullRequest: graal/13347
oracle · Dec 15, 2022 · 3027251 · 3027251
2 parents 2b8ff8e + 1f54316
commit 3027251
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 27 deletions.
diff --git a/ci/ci_common/common.jsonnet b/ci/ci_common/common.jsonnet
@@ -119,12 +119,10 @@ local add_jdk_version(name) =
   for name in std.objectFieldsAll(jdks)
 } + {
   # Aliases to edition specific labsjdks
-  labsjdk11::            self["labsjdk-" + repo_config.graalvm_edition + "-11"],
   labsjdk17::            self["labsjdk-" + repo_config.graalvm_edition + "-17"],
   labsjdk19::            self["labsjdk-" + repo_config.graalvm_edition + "-19"],
   labsjdk17Debug::       self["labsjdk-" + repo_config.graalvm_edition + "-17Debug"],
   labsjdk19Debug::       self["labsjdk-" + repo_config.graalvm_edition + "-19Debug"],
-  labsjdk11LLVM::        self["labsjdk-" + repo_config.graalvm_edition + "-11-llvm"],
   labsjdk17LLVM::        self["labsjdk-" + repo_config.graalvm_edition + "-17-llvm"],
   labsjdk19LLVM::        self["labsjdk-" + repo_config.graalvm_edition + "-19-llvm"],
 

diff --git a/ci/ci_common/run-spec-examples.libsonnet b/ci/ci_common/run-spec-examples.libsonnet
@@ -62,7 +62,7 @@ local r      = import "run-spec.libsonnet";
           "<all-os>" : r.exclude,
           "linux": {
             "amd64": {
-              "jdk19": r.task_spec({ "name": "task" }) + r.include,
+              "jdk20": r.task_spec({ "name": "task" }) + r.include,
             } +
             r.task_spec({ "target": "gate" }) + r.include,
           }
@@ -71,13 +71,13 @@ local r      = import "run-spec.libsonnet";
       local _result = {
         "linux": {
           "amd64": {
-            "jdk11": r.task_spec({
-              "target": "gate",
-            }),
             "jdk17": r.task_spec({
               "target": "gate",
             }),
             "jdk19": r.task_spec({
+              "target": "gate",
+            }),
+            "jdk20": r.task_spec({
               "name": "task",
               "target": "gate",
             }),
@@ -99,9 +99,9 @@ local r      = import "run-spec.libsonnet";
       local _result = {
         "linux": {
           "amd64": {
-            "jdk11": {},
             "jdk17": {},
             "jdk19": {},
+            "jdk20": {},
           },
         },
       };

diff --git a/ci/ci_common/run-spec.libsonnet b/ci/ci_common/run-spec.libsonnet
@@ -8,7 +8,7 @@ local examples   = (import "run-spec-examples.libsonnet").examples;
   // Supported platforms
   supported_oss_names:: ["linux", "darwin", "windows"],
   supported_archs_names:: ["amd64", "aarch64"],
-  supported_jdks_names:: ["jdk11", "jdk17", "jdk19"],
+  supported_jdks_names:: ["jdk17", "jdk19", "jdk20"],
 
   // This will turn a task dictionary into a list of build objects.
   process(task_dict)::
@@ -30,7 +30,7 @@ local examples   = (import "run-spec-examples.libsonnet").examples;
       local EXAMPLE_PLATFORM_SPEC_0 = {
         linux: {
           amd64: {
-            jdk11: $.task_spec({ /*...*/ })
+            jdk20: $.task_spec({ /*...*/ })
           }
         }
       },
@@ -39,7 +39,7 @@ local examples   = (import "run-spec-examples.libsonnet").examples;
       //
       // There is also a short-hand variant for nested entries:
       local EXAMPLE_PLATFORM_SPEC_1 = {
-        linux_amd64_jdk11: $.task_spec({ /*...*/ })
+        linux_amd64_jdk20: $.task_spec({ /*...*/ })
       },
       // See the following for more details.
       local SEE_ALSO_1 = [examples.desugaring, $.platform_spec],
@@ -136,7 +136,7 @@ local examples   = (import "run-spec-examples.libsonnet").examples;
     local EXAMPLE_0 = {
       "linux": {
         "amd64": {
-          "jdk11": $.task_spec({ /*...*/ })
+          "jdk20": $.task_spec({ /*...*/ })
         }
       }
     },

diff --git a/common.json b/common.json
@@ -4,13 +4,6 @@
   "mx_version" : "6.14.4",
 
   "jdks": {
-    "openjdk11":          {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "9", "open": true, "release": true, "platformspecific": true },
-    "oraclejdk11":        {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "9", "release": true, "platformspecific": true, "extrabundles": ["static-libs"] },
-    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.17+6-jvmci-23.0-b01", "platformspecific": true },
-    "labsjdk-ce-11-llvm": {"name": "labsjdk",   "version": "ce-11.0.17+6-jvmci-23.0-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.17+10-jvmci-23.0-b01", "platformspecific": true },
-    "labsjdk-ee-11-llvm": {"name": "labsjdk",   "version": "ee-11.0.17+10-jvmci-23.0-b01-sulong", "platformspecific": true },
-
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.1",  "build_id": "12", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.6+2-jvmci-23.0-b04", "platformspecific": true },
     "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.6+2-jvmci-23.0-b04-debug", "platformspecific": true },
@@ -35,11 +28,9 @@
 
   "COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
   "devkits": {
-    "windows-jdk11":      { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
     "windows-jdk17":      { "packages" : { "devkit:VS2019-16.9.3+1"  : "==0" }},
     "windows-jdk19":      { "packages" : { "devkit:VS2022-17.1.0+1"  : "==0" }},
     "windows-jdk20":      { "packages" : { "devkit:VS2022-17.1.0+1"  : "==0" }},
-    "linux-jdk11":      { "packages" : { "devkit:gcc7.3.0-OEL6.4+1"  : "==1" }},
     "linux-jdk17":      { "packages" : { "devkit:gcc10.3.0-OL6.4+1"  : "==0" }},
     "linux-jdk19":      { "packages" : { "devkit:gcc11.2.0-OL6.4+1"  : "==0" }},
     "linux-jdk20":      { "packages" : { "devkit:gcc11.2.0-OL6.4+1"  : "==0" }}

diff --git a/compiler/ci/ci_includes/gate.jsonnet b/compiler/ci/ci_includes/gate.jsonnet
@@ -19,6 +19,6 @@
   },
 
   builds: [
-    common.daily + common.linux_amd64 + common.oraclejdk11 + gate_math_stubs_listener,
+    common.daily + common.linux_amd64 + common.labsjdk17 + gate_math_stubs_listener,
   ]
 }
diff --git a/substratevm/ci/ci.jsonnet b/substratevm/ci/ci.jsonnet
@@ -50,15 +50,13 @@
     },
   }),
 
-  local linux_amd64_jdk11 = common.linux_amd64   + common.labsjdk11,
   local linux_amd64_jdk17 = common.linux_amd64   + common.labsjdk17,
   local linux_amd64_jdk19 = common.linux_amd64   + common.labsjdk19,
   local darwin_jdk17      = common.darwin_amd64  + common.labsjdk17,
   local windows_jdk17     = common.windows_amd64 + common.labsjdk17 + common.devkits["windows-jdk17"],
 
   // JDKs
   local jdk_name_to_dict = {
-    "jdk11"+: common.labsjdk11,
     "jdk17"+: common.labsjdk17,
     "jdk19"+: common.labsjdk19,
   },

diff --git a/wasm/ci/ci.jsonnet b/wasm/ci/ci.jsonnet
@@ -13,8 +13,6 @@
     common.jdk17_gate_linux_wabt_emsdk   + common.gate_graalwasm_emsdk_full   + common.amd64   + {environment+: {GATE_TAGS: 'buildall,wasmbenchtest'}}                + {name: 'gate-graalwasm-benchtest-linux-amd64'},
     common.jdk17_gate_windows_wabt       + common.gate_graalwasm_full         + common.amd64   + {environment+: {GATE_TAGS: 'build,wasmtest'}}                        + {name: 'gate-graalwasm-unittest-windows-amd64'} + common.devkits["windows-jdk17"],
 
-    common.jdk11_gate_linux_wabt         + common.gate_graalwasm_full         + common.aarch64 + {environment+: {GATE_TAGS: 'build,wasmtest'}}                        + {name: 'gate-graalwasm-unittest-11-linux-aarch64'},
-
     # Benchmark jobs.
     common.jdk17_bench_linux_wabt_emsdk  + common.bench_graalwasm_emsdk_full  + common.amd64 + {
       name: 'bench-graalwasm-c-micro-linux-amd64',

diff --git a/wasm/ci/ci_common/common.jsonnet b/wasm/ci/ci_common/common.jsonnet
@@ -184,6 +184,4 @@ local graal_suite_root = root_ci.graal_suite_root;
   jdk17_bench_linux_wabt_emsdk              : common.labsjdk17 + self.bench + self.linux   + self.wabt    + self.emsdk,
   jdk17_bench_linux_wabt_emsdk_nodejs       : common.labsjdk17 + self.bench + self.linux   + self.wabt    + self.emsdk + self.nodejs,
   jdk17_gate_windows_wabt                   : common.labsjdk17 + self.gate  + self.windows + self.wabt,
-
-  jdk11_gate_linux_wabt                     : common.labsjdk11 + self.gate  + self.linux   + self.wabt,
 }