Skip to content

Commit b9bf023

Browse files
authored
Disable ML when testing old ES versions on newer GLIBC (#89517) (#89520)
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
1 parent 90851d9 commit b9bf023

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

x-pack/qa/repository-old-versions/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
99
import org.elasticsearch.gradle.Architecture
1010
import org.elasticsearch.gradle.OS
1111
import org.elasticsearch.gradle.Version
12+
import org.elasticsearch.gradle.internal.BwcVersions
1213
import org.elasticsearch.gradle.internal.info.BuildParams
1314
import org.elasticsearch.gradle.internal.test.AntFixture
1415
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
@@ -114,8 +115,8 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
114115
false,
115116
"path.repo: ${repoLocation}",
116117
"path.data: ${dataPath}"
117-
if (version.onOrAfter('6.8.0') && Architecture.current() == Architecture.AARCH64) {
118-
// We need to explicitly disable ML when running old ES versions on ARM
118+
if ((version.onOrAfter('6.8.0') && Architecture.current() == Architecture.AARCH64) || BwcVersions.isMlCompatible(version) == false) {
119+
// We need to explicitly disable ML when running old ES versions on ARM or on systems with newer GLIBC
119120
args 'xpack.ml.enabled: false'
120121
}
121122
doFirst {

0 commit comments

Comments
 (0)