Fix cacheability of repository-hdfs integ tests (#52858)

This commit is contained in:
Mark Vieira 2020-02-27 09:53:33 -08:00
parent 14f847cc8f
commit f46b370e7a
No known key found for this signature in database
GPG Key ID: CA947EF7E6D4B105
1 changed files with 15 additions and 6 deletions

View File

@ -79,7 +79,7 @@ normalization {
// ignore generated keytab files for the purposes of build avoidance
ignore '*.keytab'
// ignore fixture ports file which is on the classpath primarily to pacify the security manager
ignore '*HdfsFixture/**'
ignore 'ports'
}
}
@ -157,20 +157,29 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
runner {
onlyIf { BuildParams.inFipsJvm == false }
if (integTestTaskName.contains("Ha")) {
Path portsFile
File portsFileDir = file("${workingDir}/hdfsFixture")
if (integTestTaskName.contains("Secure")) {
Path path = buildDir.toPath()
portsFile = buildDir.toPath()
.resolve("fixtures")
.resolve("secureHaHdfsFixture")
.resolve("ports")
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
} else {
Path path = buildDir.toPath()
portsFile = buildDir.toPath()
.resolve("fixtures")
.resolve("haHdfsFixture")
.resolve("ports")
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
}
classpath += files("$buildDir/fixtures")
nonInputProperties.systemProperty "test.hdfs-fixture.ports", file("$portsFileDir/ports")
classpath += files(portsFileDir)
// Copy ports file to separate location which is placed on the test classpath
doFirst {
mkdir(portsFileDir)
copy {
from portsFile
into portsFileDir
}
}
}
if (integTestTaskName.contains("Secure")) {