[TEST] Run pre 6.4 nodes in non-FIPS JVMs (#32901)
Elasticsearch versions earlier than 6.4.0 cannot properly run in a FIPS 140 JVM. This commit ensures that we use a non-FIPS JVM for nodes that we spin up in BWC tests even when we're testing FIPS.
This commit is contained in:
parent
da6b61e8ef
commit
e3aa68b0a9
|
@ -177,6 +177,12 @@ class NodeInfo {
|
|||
javaVersion = 8
|
||||
} else if (nodeVersion.onOrAfter("6.2.0") && nodeVersion.before("6.3.0")) {
|
||||
javaVersion = 9
|
||||
} else if (project.inFipsJvm && nodeVersion.onOrAfter("6.3.0") && nodeVersion.before("6.4.0")) {
|
||||
/*
|
||||
* Elasticsearch versions before 6.4.0 cannot be run in a FIPS-140 JVM. If we're running
|
||||
* bwc tests in a FIPS-140 JVM, ensure that the pre v6.4.0 nodes use a Java 10 JVM instead.
|
||||
*/
|
||||
javaVersion = 10
|
||||
}
|
||||
|
||||
args.addAll("-E", "node.portsfile=true")
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
import org.elasticsearch.gradle.test.RestIntegTestTask
|
||||
|
||||
// Skip test on FIPS FIXME https://github.com/elastic/elasticsearch/issues/32737
|
||||
if (project.inFipsJvm) {
|
||||
tasks.withType(RestIntegTestTask) {
|
||||
enabled = false
|
||||
}
|
||||
}
|
|
@ -1,10 +1 @@
|
|||
import org.elasticsearch.gradle.test.RestIntegTestTask
|
||||
|
||||
// Skip test on FIPS FIXME https://github.com/elastic/elasticsearch/issues/32737
|
||||
if (project.inFipsJvm) {
|
||||
tasks.withType(RestIntegTestTask) {
|
||||
enabled = false
|
||||
}
|
||||
}
|
||||
|
||||
group = "${group}.x-pack.qa.rolling-upgrade.with-system-key"
|
||||
|
|
Loading…
Reference in New Issue