mirror of
https://github.com/elastic/elasticsearch.git
synced 2025-06-29 01:44:36 -04:00
Fix configuration cache compatibility issues (#124073)
- for running :plugins:discovery-ec2:check - checking if in idea in build scan background action
This commit is contained in:
parent
badfc93596
commit
cfa98f30e5
2 changed files with 8 additions and 9 deletions
|
@ -133,7 +133,7 @@ develocity {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tag 'LOCAL'
|
tag 'LOCAL'
|
||||||
if (providers.systemProperty('idea.active').present) {
|
if (System.getProperty('idea.active') == 'true') {
|
||||||
tag 'IDEA'
|
tag 'IDEA'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,13 +46,12 @@ esplugin.bundleSpec.from('config/discovery-ec2') {
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register("writeTestJavaPolicy") {
|
tasks.register("writeTestJavaPolicy") {
|
||||||
|
boolean inFips = buildParams.inFipsJvm
|
||||||
|
inputs.property("inFipsJvm", inFips)
|
||||||
|
final File javaPolicy = new File(layout.buildDirectory.asFile.get(), "tmp/java.policy")
|
||||||
|
outputs.file(javaPolicy)
|
||||||
doLast {
|
doLast {
|
||||||
final File tmp = file("${buildDir}/tmp")
|
if (inFips) {
|
||||||
if (tmp.exists() == false && tmp.mkdirs() == false) {
|
|
||||||
throw new GradleException("failed to create temporary directory [${tmp}]")
|
|
||||||
}
|
|
||||||
final File javaPolicy = file("${tmp}/java.policy")
|
|
||||||
if (buildParams.inFipsJvm) {
|
|
||||||
javaPolicy.write(
|
javaPolicy.write(
|
||||||
[
|
[
|
||||||
"grant {",
|
"grant {",
|
||||||
|
@ -95,9 +94,9 @@ tasks.withType(Test).configureEach {
|
||||||
// this is needed to manipulate com.amazonaws.sdk.ec2MetadataServiceEndpointOverride system property
|
// this is needed to manipulate com.amazonaws.sdk.ec2MetadataServiceEndpointOverride system property
|
||||||
// it is better rather disable security manager at all with `systemProperty 'tests.security.manager', 'false'`
|
// it is better rather disable security manager at all with `systemProperty 'tests.security.manager', 'false'`
|
||||||
if (buildParams.inFipsJvm){
|
if (buildParams.inFipsJvm){
|
||||||
nonInputProperties.systemProperty 'java.security.policy', "=file://${buildDir}/tmp/java.policy"
|
nonInputProperties.systemProperty 'java.security.policy', "=file://${layout.buildDirectory.asFile.get()}/tmp/java.policy"
|
||||||
} else {
|
} else {
|
||||||
nonInputProperties.systemProperty 'java.security.policy', "file://${buildDir}/tmp/java.policy"
|
nonInputProperties.systemProperty 'java.security.policy', "file://${layout.buildDirectory.asFile.get()}/tmp/java.policy"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue