honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-08 22:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TEST] Run pre 6.4 nodes in non-FIPS JVMs (#32901)

Browse Source 
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:
Ioannis Kakavas 2018-08-17 18:23:13 +03:00 committed by GitHub
parent da6b61e8ef
commit e3aa68b0a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/NodeInfo.groovy
View File

@ -177,6 +177,12 @@ class NodeInfo {
javaVersion = 8 javaVersion = 8
} else if (nodeVersion.onOrAfter("6.2.0") && nodeVersion.before("6.3.0")) { } else if (nodeVersion.onOrAfter("6.2.0") && nodeVersion.before("6.3.0")) {
javaVersion = 9 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") args.addAll("-E", "node.portsfile=true")

8
x-pack/qa/full-cluster-restart/with-system-key/build.gradle
View File

@ -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
}
}

9
x-pack/qa/rolling-upgrade/with-system-key/build.gradle
View File

@ -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" group = "${group}.x-pack.qa.rolling-upgrade.with-system-key"