From 3186710cfd421d6da2753628d91e524417e5f66e Mon Sep 17 00:00:00 2001
From: Mark Vieira <portugee@gmail.com>
Date: Mon, 22 Aug 2022 13:05:58 -0700
Subject: [PATCH] Disable ML when testing old ES versions on newer GLIBC
 (#89517)

When testing on systems with later GLIBC versions (> 2.34) we need to
ensure we disable ML for ES versions that have not been patched with
this fix. This PR updates the old repository integration tests
appropriately.

Example failure: https://gradle-enterprise.elastic.co/s/do3qaak77usde
---
 x-pack/qa/repository-old-versions/build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/x-pack/qa/repository-old-versions/build.gradle b/x-pack/qa/repository-old-versions/build.gradle
index 5d9ca61ca31ed..cd5b4c1d986e8 100644
--- a/x-pack/qa/repository-old-versions/build.gradle
+++ b/x-pack/qa/repository-old-versions/build.gradle
@@ -9,6 +9,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
 import org.elasticsearch.gradle.Architecture
 import org.elasticsearch.gradle.OS
 import org.elasticsearch.gradle.Version
+import org.elasticsearch.gradle.internal.BwcVersions
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.internal.test.AntFixture
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
@@ -114,8 +115,8 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         false,
         "path.repo: ${repoLocation}",
         "path.data: ${dataPath}"
-      if (version.onOrAfter('6.8.0') && Architecture.current() == Architecture.AARCH64) {
-        // We need to explicitly disable ML when running old ES versions on ARM
+      if ((version.onOrAfter('6.8.0') && Architecture.current() == Architecture.AARCH64) || BwcVersions.isMlCompatible(version) == false) {
+        // We need to explicitly disable ML when running old ES versions on ARM or on systems with newer GLIBC
         args 'xpack.ml.enabled: false'
       }
       doFirst {