Skip to content

Commit 65740c2

Browse files
committed
Fix cacheability of repository-hdfs integ tests (#52858)
1 parent 5e1ea07 commit 65740c2

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

plugins/repository-hdfs/build.gradle

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ normalization {
7979
// ignore generated keytab files for the purposes of build avoidance
8080
ignore '*.keytab'
8181
// ignore fixture ports file which is on the classpath primarily to pacify the security manager
82-
ignore '*HdfsFixture/**'
82+
ignore 'ports'
8383
}
8484
}
8585

@@ -157,20 +157,29 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
157157
runner {
158158
onlyIf { BuildParams.inFipsJvm == false }
159159
if (integTestTaskName.contains("Ha")) {
160+
Path portsFile
161+
File portsFileDir = file("${workingDir}/hdfsFixture")
160162
if (integTestTaskName.contains("Secure")) {
161-
Path path = buildDir.toPath()
163+
portsFile = buildDir.toPath()
162164
.resolve("fixtures")
163165
.resolve("secureHaHdfsFixture")
164166
.resolve("ports")
165-
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
166167
} else {
167-
Path path = buildDir.toPath()
168+
portsFile = buildDir.toPath()
168169
.resolve("fixtures")
169170
.resolve("haHdfsFixture")
170171
.resolve("ports")
171-
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
172172
}
173-
classpath += files("$buildDir/fixtures")
173+
nonInputProperties.systemProperty "test.hdfs-fixture.ports", file("$portsFileDir/ports")
174+
classpath += files(portsFileDir)
175+
// Copy ports file to separate location which is placed on the test classpath
176+
doFirst {
177+
mkdir(portsFileDir)
178+
copy {
179+
from portsFile
180+
into portsFileDir
181+
}
182+
}
174183
}
175184

176185
if (integTestTaskName.contains("Secure")) {

0 commit comments

Comments
 (0)