From 44c9cdad025af46db8130a5e283266c8eca2c8c5 Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Fri, 18 Jul 2025 08:39:51 +0200 Subject: [PATCH 1/2] Enable entitlements for serverless tests --- .../gradle/test/TestBuildInfoPlugin.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java b/build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java index c0aabfe17e56f..2581c15e36a50 100644 --- a/build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java +++ b/build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java @@ -57,13 +57,11 @@ public void apply(Project project) { task.into("META-INF", copy -> copy.from(testBuildInfoTask)); }); - if (project.getRootProject().getName().equals("elasticsearch")) { - project.getTasks() - .withType(Test.class) - .matching(test -> List.of("test", "internalClusterTest").contains(test.getName())) - .configureEach(test -> { - test.systemProperty("es.entitlement.enableForTests", "true"); - }); - } + project.getTasks() + .withType(Test.class) + .matching(test -> List.of("test", "internalClusterTest").contains(test.getName())) + .configureEach(test -> { + test.systemProperty("es.entitlement.enableForTests", "true"); + }); } } From e9a46406f998d2ea6d9bad957025f9dfd058ebe1 Mon Sep 17 00:00:00 2001 From: Moritz Mack Date: Wed, 23 Jul 2025 14:01:56 +0200 Subject: [PATCH 2/2] disable entitlements in example plugin tests --- .../org/elasticsearch/gradle/test/TestBuildInfoPlugin.java | 4 +--- plugins/examples/build.gradle | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java b/build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java index 2581c15e36a50..307de78a15d25 100644 --- a/build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java +++ b/build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java @@ -60,8 +60,6 @@ public void apply(Project project) { project.getTasks() .withType(Test.class) .matching(test -> List.of("test", "internalClusterTest").contains(test.getName())) - .configureEach(test -> { - test.systemProperty("es.entitlement.enableForTests", "true"); - }); + .configureEach(test -> test.getSystemProperties().putIfAbsent("es.entitlement.enableForTests", "true")); } } diff --git a/plugins/examples/build.gradle b/plugins/examples/build.gradle index c5f75e71e4842..d1d802e288419 100644 --- a/plugins/examples/build.gradle +++ b/plugins/examples/build.gradle @@ -20,6 +20,11 @@ subprojects { targetCompatibility = 21 } + test { + // testing with entitlements doesn't work for example plugins ES-12453 + systemProperty 'es.entitlement.enableForTests', 'false' + } + repositories { // Only necessary when building plugins against SNAPSHOT versions of Elasticsearch if (gradle.includedBuilds.isEmpty()) {