Add FIPS specific testclusters configuration (#41199)
ClusterFormationTasks auto configured these properties for clusters. This PR adds FIPS specific configuration across all test clusters from the main build script to prevent coupling betwwen testclusters and the build plugin. Closes #40904
This commit is contained in:
parent
0bb15d3dac
commit
e1e2568fa3
15
build.gradle
15
build.gradle
|
@ -598,6 +598,21 @@ allprojects {
|
|||
}
|
||||
}
|
||||
|
||||
subprojects {
|
||||
// Common config when running with a FIPS-140 runtime JVM
|
||||
if (project.ext.has("inFipsJvm") && project.ext.inFipsJvm) {
|
||||
tasks.withType(Test) {
|
||||
systemProperty 'javax.net.ssl.trustStorePassword', 'password'
|
||||
systemProperty 'javax.net.ssl.keyStorePassword', 'password'
|
||||
}
|
||||
project.pluginManager.withPlugin("elasticsearch.testclusters") {
|
||||
project.testClusters.all {
|
||||
systemProperty 'javax.net.ssl.trustStorePassword', 'password'
|
||||
systemProperty 'javax.net.ssl.keyStorePassword', 'password'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1004,12 +1004,6 @@ class BuildPlugin implements Plugin<Project> {
|
|||
// TODO: remove this once ctx isn't added to update script params in 7.0
|
||||
systemProperty 'es.scripting.update.ctx_in_params', 'false'
|
||||
|
||||
// Set the system keystore/truststore password if we're running tests in a FIPS-140 JVM
|
||||
if (project.inFipsJvm) {
|
||||
systemProperty 'javax.net.ssl.trustStorePassword', 'password'
|
||||
systemProperty 'javax.net.ssl.keyStorePassword', 'password'
|
||||
}
|
||||
|
||||
testLogging {
|
||||
showExceptions = true
|
||||
showCauses = true
|
||||
|
|
|
@ -95,12 +95,6 @@ dependencies {
|
|||
es090 'org.elasticsearch:elasticsearch:0.90.13@zip'
|
||||
}
|
||||
|
||||
// Issue tracked in https://github.com/elastic/elasticsearch/issues/40904
|
||||
if (project.inFipsJvm) {
|
||||
testingConventions.enabled = false
|
||||
integTest.enabled = false
|
||||
}
|
||||
|
||||
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
||||
logger.warn("Disabling reindex-from-old tests because we can't get the pid file on windows")
|
||||
integTest.runner {
|
||||
|
|
Loading…
Reference in New Issue