@@ -79,7 +79,7 @@ normalization {
79
79
// ignore generated keytab files for the purposes of build avoidance
80
80
ignore ' *.keytab'
81
81
// ignore fixture ports file which is on the classpath primarily to pacify the security manager
82
- ignore ' *HdfsFixture/** '
82
+ ignore ' ports '
83
83
}
84
84
}
85
85
@@ -152,20 +152,29 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
152
152
runner {
153
153
onlyIf { BuildParams . inFipsJvm == false }
154
154
if (integTestTaskName. contains(" Ha" )) {
155
+ Path portsFile
156
+ File portsFileDir = file(" ${ workingDir} /hdfsFixture" )
155
157
if (integTestTaskName. contains(" Secure" )) {
156
- Path path = buildDir. toPath()
158
+ portsFile = buildDir. toPath()
157
159
.resolve(" fixtures" )
158
160
.resolve(" secureHaHdfsFixture" )
159
161
.resolve(" ports" )
160
- nonInputProperties. systemProperty " test.hdfs-fixture.ports" , path
161
162
} else {
162
- Path path = buildDir. toPath()
163
+ portsFile = buildDir. toPath()
163
164
.resolve(" fixtures" )
164
165
.resolve(" haHdfsFixture" )
165
166
.resolve(" ports" )
166
- nonInputProperties. systemProperty " test.hdfs-fixture.ports" , path
167
167
}
168
- classpath + = files(" $buildDir /fixtures" )
168
+ nonInputProperties. systemProperty " test.hdfs-fixture.ports" , file(" $portsFileDir /ports" )
169
+ classpath + = files(portsFileDir)
170
+ // Copy ports file to separate location which is placed on the test classpath
171
+ doFirst {
172
+ mkdir(portsFileDir)
173
+ copy {
174
+ from portsFile
175
+ into portsFileDir
176
+ }
177
+ }
169
178
}
170
179
171
180
if (integTestTaskName. contains(" Secure" )) {
0 commit comments