Skip to content

Commit cbbb2b7

Browse files
committed
[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.
1 parent b3a60e3 commit cbbb2b7

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,12 @@ class NodeInfo {
177177
javaVersion = 8
178178
} else if (nodeVersion.onOrAfter("6.2.0") && nodeVersion.before("6.3.0")) {
179179
javaVersion = 9
180+
} else if (project.inFipsJvm && nodeVersion.onOrAfter("6.3.0") && nodeVersion.before("6.4.0")) {
181+
/*
182+
* Elasticsearch versions before 6.4.0 cannot be run in a FIPS-140 JVM. If we're running
183+
* bwc tests in a FIPS-140 JVM, ensure that the pre v6.4.0 nodes use a Java 10 JVM instead.
184+
*/
185+
javaVersion = 10
180186
}
181187

182188
args.addAll("-E", "node.portsfile=true")
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +0,0 @@
1-
import org.elasticsearch.gradle.test.RestIntegTestTask
2-
3-
// Skip test on FIPS FIXME https://github.com/elastic/elasticsearch/issues/32737
4-
if (project.inFipsJvm) {
5-
tasks.withType(RestIntegTestTask) {
6-
enabled = false
7-
}
8-
}
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +0,0 @@
1-
import org.elasticsearch.gradle.test.RestIntegTestTask
2-
3-
// Skip test on FIPS FIXME https://github.com/elastic/elasticsearch/issues/32737
4-
if (project.inFipsJvm) {
5-
tasks.withType(RestIntegTestTask) {
6-
enabled = false
7-
}
8-
}

0 commit comments

Comments
 (0)