[Gradle/BWC] Patch bundled OpenJdk17 with Adoptium Jdk17 for older ES Distros by breskeby · Pull Request #135300 · elastic/elasticsearch

breskeby · 2025-09-23T17:20:55Z

Bundled OpenJDK 17 is incompatible with newer versions of Ubuntu 24.04 (Kernel 6.14.x).
We fix our bwc testing on ubuntu 24.04 to explicitly use adoptium jdk 17 in cases where the bundled JDK is
older than 21 which is not affected.

elasticsearchmachine · 2025-09-23T17:21:21Z

Pinging @elastic/es-delivery (Team:Delivery)

rjernst · 2025-09-23T17:57:58Z

server/src/main/resources/transport/upper_bounds/9.2.csv

@@ -1 +1 @@
-security_stats_endpoint,9168000
+inference_api_openai_embeddings_headers,9169000


note: this was changed due to a bug in transport version generation, but it is innocuous. Upstream main already contains this change, so the final squash merge won't show this change.

rjernst · 2025-09-23T18:02:10Z

...s-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java

+                            spec.getLanguageVersion().set(JavaLanguageVersion.of(17));
+                        });
+                        task.environment(
+                            "ES_FALLBACK_JAVA_HOME",


what is the env var? I don't see it used anywhere else and it's not something ES knows about

breskeby · 2025-09-23T18:12:46Z

...clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java


        private Map<String, String> getEnvironmentVariables() {
            Map<String, String> environment = new HashMap<>(spec.resolveEnvironment());
+            String esFallbackJavaHome = System.getenv("ES_FALLBACK_JAVA_HOME");


@rjernst this is where the variable is used.

rjernst

LGTM

jozala · 2025-09-24T07:13:51Z

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

+    private boolean isUbuntu2404OrLater() {
+        try {
+            if (OS.current() != OS.LINUX) {
+                return false;
+            }
+
+            // Read /etc/os-release file to get distribution info
+            Path osRelease = Path.of("/etc/os-release");
+            if (!Files.exists(osRelease)) {
+                return false;
+            }
+
+            String content = Files.readString(osRelease);
+            boolean isUbuntu = content.contains("ID=ubuntu");
+
+            if (!isUbuntu) {
+                return false;
+            }
+
+            // Extract version
+            String versionLine = content.lines().filter(line -> line.startsWith("VERSION_ID=")).findFirst().orElse("");
+
+            if (versionLine.isEmpty()) {
+                return false;
+            }
+
+            String version = versionLine.substring("VERSION_ID=".length()).replace("\"", "");
+            String[] parts = version.split("\\.");
+
+            if (parts.length >= 2) {
+                int major = Integer.parseInt(parts[0]);
+                int minor = Integer.parseInt(parts[1]);
+                return major > 24 || (major == 24 && minor >= 4);
+            }
+
+            return false;
+        } catch (Exception e) {
+            LOGGER.debug("Failed to detect Ubuntu version", e);
+            return false;
+        }
+    }
+


I think this has been moved to OsUtils.isUbuntu2404OrLater() and is not needed here any more.

… Distros Bundled OpenJDK 17 is incompatible with newer versions of Ubuntu 24.04 (Kernel 6.14.x). We fix our bwc testing on ubuntu 24.04 to explicitly use adoptium jdk 17 in cases where the bundled JDK is older than 21 which is not affected.

… Distros (elastic#135300) Bundled OpenJDK 17 is incompatible with newer versions of Ubuntu 24.04 (Kernel 6.14.x). We fix our bwc testing on ubuntu 24.04 to explicitly use adoptium jdk 17 in cases where the bundled JDK is older than 21 which is not affected.

elasticsearchmachine · 2025-09-24T14:15:02Z

💚 Backport successful

Status	Branch	Result
✅	8.19
✅	9.1
✅	9.0
✅	8.18

… Distros (#135300) (#135363) Bundled OpenJDK 17 is incompatible with newer versions of Ubuntu 24.04 (Kernel 6.14.x). We fix our bwc testing on ubuntu 24.04 to explicitly use adoptium jdk 17 in cases where the bundled JDK is older than 21 which is not affected.

… Distros (#135300) (#135362) Bundled OpenJDK 17 is incompatible with newer versions of Ubuntu 24.04 (Kernel 6.14.x). We fix our bwc testing on ubuntu 24.04 to explicitly use adoptium jdk 17 in cases where the bundled JDK is older than 21 which is not affected.

… Distros (#135300) (#135360) Bundled OpenJDK 17 is incompatible with newer versions of Ubuntu 24.04 (Kernel 6.14.x). We fix our bwc testing on ubuntu 24.04 to explicitly use adoptium jdk 17 in cases where the bundled JDK is older than 21 which is not affected.

… Distros (#135300) (#135361) Bundled OpenJDK 17 is incompatible with newer versions of Ubuntu 24.04 (Kernel 6.14.x). We fix our bwc testing on ubuntu 24.04 to explicitly use adoptium jdk 17 in cases where the bundled JDK is older than 21 which is not affected.

…fallback In elastic#135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots.

…fallback (#135399) In #135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots.

…fallback (elastic#135399) In elastic#135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots.

…fallback (elastic#135399) In elastic#135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots. (cherry picked from commit 6047a74) # Conflicts: # test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java

…fallback (elastic#135399) In elastic#135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots. (cherry picked from commit 6047a74) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java

…fallback (elastic#135399) In elastic#135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots. (cherry picked from commit 6047a74) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java # test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java

…g jdk fallback (#135399) (#135404) * [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399) In #135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots. * fix typo

…g jdk fallback (#135399) (#135410) * [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399) In #135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots. (cherry picked from commit 6047a74) # Conflicts: # test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java * Fix typo

…ng jdk fallback (#135399) (#135411) * [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399) In #135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots. (cherry picked from commit 6047a74) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java * Fix typo

…ng jdk fallback (#135399) (#135412) * [CI] Handle git snapshot BWC versions correctly when calculating jdk fallback (#135399) In #135300 we introduced a fallback to use adoptopenjdk17 when running bwc tests with older distributions. This fix handles the calculation of overriding requirement by taken 0.0.0 version into account which is used to represent versions representing git snapshots. (cherry picked from commit 6047a74) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java # test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java * [CI] Auto commit changes from spotless * Fix typo --------- Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>

… Distros (elastic#135300) (elastic#135363) Bundled OpenJDK 17 is incompatible with newer versions of Ubuntu 24.04 (Kernel 6.14.x). We fix our bwc testing on ubuntu 24.04 to explicitly use adoptium jdk 17 in cases where the bundled JDK is older than 21 which is not affected. (cherry picked from commit fec83ac) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java # build-tools/src/integTest/groovy/org/elasticsearch/gradle/TestClustersPluginFuncTest.groovy # build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java # build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java # build-tools/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java # test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java

breskeby requested a review from a team as a code owner September 23, 2025 17:20

breskeby added >non-issue :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team auto-backport Automatically create backport pull requests when merged v9.2.0 v8.19.5 v9.1.5 v9.0.8 v8.18.9 labels Sep 23, 2025

breskeby self-assigned this Sep 23, 2025

breskeby requested a review from rjernst September 23, 2025 17:21

rjernst reviewed Sep 23, 2025

View reviewed changes

breskeby commented Sep 23, 2025

View reviewed changes

rjernst approved these changes Sep 23, 2025

View reviewed changes

jozala reviewed Sep 24, 2025

View reviewed changes

breskeby added 2 commits September 24, 2025 10:31

Cleanup

cab7c41

breskeby force-pushed the override-jdk17-for-ubuntu2024 branch from acc05df to cab7c41 Compare September 24, 2025 08:32

More cleanup

79315b9

breskeby added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Sep 24, 2025

breskeby merged commit 8927f5b into elastic:main Sep 24, 2025
34 checks passed

breskeby deleted the override-jdk17-for-ubuntu2024 branch September 24, 2025 14:13

breskeby mentioned this pull request Sep 24, 2025

[8.19] [Gradle/BWC] Patch bundled OpenJdk17 with Adoptium Jdk17 for older ES Distros (#135300) #135360

Merged

breskeby mentioned this pull request Sep 24, 2025

[9.1] [Gradle/BWC] Patch bundled OpenJdk17 with Adoptium Jdk17 for older ES Distros (#135300) #135361

Merged

breskeby mentioned this pull request Sep 24, 2025

[9.0] [Gradle/BWC] Patch bundled OpenJdk17 with Adoptium Jdk17 for older ES Distros (#135300) #135362

Merged

breskeby mentioned this pull request Sep 24, 2025

[8.18] [Gradle/BWC] Patch bundled OpenJdk17 with Adoptium Jdk17 for older ES Distros (#135300) #135363

Merged

breskeby mentioned this pull request Sep 25, 2025

[CI] Handle snapshot BWC version when patching bundled jdk #135399

Merged

joegallo added the v8.18.8 label Sep 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Gradle/BWC] Patch bundled OpenJdk17 with Adoptium Jdk17 for older ES Distros#135300

[Gradle/BWC] Patch bundled OpenJdk17 with Adoptium Jdk17 for older ES Distros#135300
breskeby merged 3 commits intoelastic:mainfrom
breskeby:override-jdk17-for-ubuntu2024

breskeby commented Sep 23, 2025

Uh oh!

elasticsearchmachine commented Sep 23, 2025

Uh oh!

rjernst Sep 23, 2025

Uh oh!

rjernst Sep 23, 2025

Uh oh!

breskeby Sep 23, 2025

Uh oh!

rjernst left a comment

Uh oh!

jozala Sep 24, 2025

Uh oh!

breskeby Sep 24, 2025

Uh oh!

Uh oh!

elasticsearchmachine commented Sep 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

		@@ -1 +1 @@
		security_stats_endpoint,9168000
		inference_api_openai_embeddings_headers,9169000

Conversation

breskeby commented Sep 23, 2025

Uh oh!

elasticsearchmachine commented Sep 23, 2025

Uh oh!

rjernst Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

rjernst Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

breskeby Sep 23, 2025

Choose a reason for hiding this comment

Uh oh!

rjernst left a comment

Choose a reason for hiding this comment

Uh oh!

jozala Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

breskeby Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elasticsearchmachine commented Sep 24, 2025

💚 Backport successful

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants