Skip to content

Commit e9a4640

Browse files
committed
disable entitlements in example plugin tests
1 parent 44c9cda commit e9a4640

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ public void apply(Project project) {
6060
project.getTasks()
6161
.withType(Test.class)
6262
.matching(test -> List.of("test", "internalClusterTest").contains(test.getName()))
63-
.configureEach(test -> {
64-
test.systemProperty("es.entitlement.enableForTests", "true");
65-
});
63+
.configureEach(test -> test.getSystemProperties().putIfAbsent("es.entitlement.enableForTests", "true"));
6664
}
6765
}

plugins/examples/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ subprojects {
2020
targetCompatibility = 21
2121
}
2222

23+
test {
24+
// testing with entitlements doesn't work for example plugins ES-12453
25+
systemProperty 'es.entitlement.enableForTests', 'false'
26+
}
27+
2328
repositories {
2429
// Only necessary when building plugins against SNAPSHOT versions of Elasticsearch
2530
if (gradle.includedBuilds.isEmpty()) {

0 commit comments

Comments
 (0)