Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.4] Disable ML when testing old ES versions on newer GLIBC (#89517) #89520

Merged
merged 1 commit into from
Aug 22, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions x-pack/qa/repository-old-versions/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down