Repository plugin test cacheability fixes (#46572)
This commit is contained in:
parent
23bf310c84
commit
ccf656a9d0
|
@ -16,6 +16,8 @@
|
||||||
* specific language governing permissions and limitations
|
* specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import org.elasticsearch.gradle.PropertyNormalization
|
||||||
import org.elasticsearch.gradle.test.AntFixture
|
import org.elasticsearch.gradle.test.AntFixture
|
||||||
|
|
||||||
esplugin {
|
esplugin {
|
||||||
|
@ -42,7 +44,7 @@ integTest {
|
||||||
}
|
}
|
||||||
testClusters.integTest {
|
testClusters.integTest {
|
||||||
// repositoryDir is used by a FS repository to create snapshots
|
// repositoryDir is used by a FS repository to create snapshots
|
||||||
setting 'path.repo', "${repositoryDir.absolutePath}"
|
setting 'path.repo', "${repositoryDir.absolutePath}", PropertyNormalization.IGNORE_VALUE
|
||||||
// repositoryDir is used by two URL repositories to restore snapshots
|
// repositoryDir is used by two URL repositories to restore snapshots
|
||||||
setting 'repositories.url.allowed_urls', { "http://snapshot.test*,http://${urlFixture.addressAndPort}" }
|
setting 'repositories.url.allowed_urls', { "http://snapshot.test*,http://${urlFixture.addressAndPort}" }, PropertyNormalization.IGNORE_VALUE
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,6 +75,8 @@ normalization {
|
||||||
runtimeClasspath {
|
runtimeClasspath {
|
||||||
// ignore generated keytab files for the purposes of build avoidance
|
// ignore generated keytab files for the purposes of build avoidance
|
||||||
ignore '*.keytab'
|
ignore '*.keytab'
|
||||||
|
// ignore fixture ports file which is on the classpath primarily to pacify the security manager
|
||||||
|
ignore '*HdfsFixture/**'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -158,15 +160,14 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
|
||||||
.resolve("secureHaHdfsFixture")
|
.resolve("secureHaHdfsFixture")
|
||||||
.resolve("ports")
|
.resolve("ports")
|
||||||
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
|
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
|
||||||
classpath += files(path)
|
|
||||||
} else {
|
} else {
|
||||||
Path path = buildDir.toPath()
|
Path path = buildDir.toPath()
|
||||||
.resolve("fixtures")
|
.resolve("fixtures")
|
||||||
.resolve("haHdfsFixture")
|
.resolve("haHdfsFixture")
|
||||||
.resolve("ports")
|
.resolve("ports")
|
||||||
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
|
nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
|
||||||
classpath += files(path)
|
|
||||||
}
|
}
|
||||||
|
classpath += files("$buildDir/fixtures")
|
||||||
}
|
}
|
||||||
|
|
||||||
if (integTestTaskName.contains("Secure")) {
|
if (integTestTaskName.contains("Secure")) {
|
||||||
|
|
Loading…
Reference in New Issue