Move the FIPS configuration back to the build plugin (#41989)
* Move the FIPS configuration back to the build plugin This is necesary for external users of build-tools. Closes #41721
This commit is contained in:
parent
a6204a5eaf
commit
cef4b9ba76
15
build.gradle
15
build.gradle
|
@ -619,21 +619,6 @@ 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'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -116,6 +116,22 @@ class BuildPlugin implements Plugin<Project> {
|
||||||
configureTestTasks(project)
|
configureTestTasks(project)
|
||||||
configurePrecommit(project)
|
configurePrecommit(project)
|
||||||
configureDependenciesInfo(project)
|
configureDependenciesInfo(project)
|
||||||
|
|
||||||
|
// Common config when running with a FIPS-140 runtime JVM
|
||||||
|
// Need to do it here to support external plugins
|
||||||
|
if (project.ext.inFipsJvm) {
|
||||||
|
project.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'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue