@@ -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
@@ -157,20 +157,29 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
157
157
runner {
158
158
onlyIf { BuildParams . inFipsJvm == false }
159
159
if (integTestTaskName. contains(" Ha" )) {
160
+ Path portsFile
161
+ File portsFileDir = file(" ${ workingDir} /hdfsFixture" )
160
162
if (integTestTaskName. contains(" Secure" )) {
161
- Path path = buildDir. toPath()
163
+ portsFile = buildDir. toPath()
162
164
.resolve(" fixtures" )
163
165
.resolve(" secureHaHdfsFixture" )
164
166
.resolve(" ports" )
165
- nonInputProperties. systemProperty " test.hdfs-fixture.ports" , path
166
167
} else {
167
- Path path = buildDir. toPath()
168
+ portsFile = buildDir. toPath()
168
169
.resolve(" fixtures" )
169
170
.resolve(" haHdfsFixture" )
170
171
.resolve(" ports" )
171
- nonInputProperties. systemProperty " test.hdfs-fixture.ports" , path
172
172
}
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
+ }
174
183
}
175
184
176
185
if (integTestTaskName. contains(" Secure" )) {
0 commit comments