Skip to content

Enable entitlements for serverless tests #131501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 30, 2025
Merged

Enable entitlements for serverless tests #131501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
44c9cda
Enable entitlements for serverless tests
mosche Jul 18, 2025
e9a4640
disable entitlements in example plugin tests
mosche Jul 23, 2025
ac7d449
Merge branch 'main' into entitlements/serverless_tests
mosche Jul 23, 2025
a59a527
Merge branch 'main' into entitlements/serverless_tests
mosche Jul 24, 2025
d3bfd62
Merge branch 'main' into entitlements/serverless_tests
mosche Jul 29, 2025
071fb89
Merge branch 'main' into entitlements/serverless_tests
mosche Jul 29, 2025
10447d9
Merge branch 'main' into entitlements/serverless_tests
mosche Jul 29, 2025
63c938a
Merge branch 'main' into entitlements/serverless_tests
mosche Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions build-tools/src/main/java/org/elasticsearch/gradle/test/TestBuildInfoPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,9 @@ 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.getSystemProperties().putIfAbsent("es.entitlement.enableForTests", "true"));
}
}
5 changes: 5 additions & 0 deletions plugins/examples/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down