Skip to content

Only use test-error-query in snapshot builds #131134

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
smalyshev merged 7 commits into from
Jul 23, 2025
Merged

Only use test-error-query in snapshot builds #131134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
30de60b
Only use test-error-query in snapshot builds
smalyshev Jul 11, 2025
923b409
Merge branch 'main' into fix-130978
mark-vieira Jul 14, 2025
e06168a
Merge branch 'main' into fix-130978
smalyshev Jul 15, 2025
7b823ea
Remove ban on StandaloneRestIntegTestTask in release
smalyshev Jul 15, 2025
a54a9bd
Merge branch 'main' into fix-130978
smalyshev Jul 15, 2025
c14c31d
Merge branch 'main' into fix-130978
smalyshev Jul 22, 2025
4a12375
Merge branch 'main' into fix-130978
smalyshev Jul 22, 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
7 changes: 0 additions & 7 deletions x-pack/plugin/async-search/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask

apply plugin: 'elasticsearch.internal-es-plugin'
apply plugin: 'elasticsearch.internal-cluster-test'
apply plugin: 'elasticsearch.internal-java-rest-test'
Expand Down Expand Up @@ -36,8 +34,3 @@ restResources {
include '_common', 'indices', 'index', 'async_search'
}
}

tasks.withType(StandaloneRestIntegTestTask).configureEach {
def isSnapshot = buildParams.snapshotBuild
it.onlyIf("snapshot build") { isSnapshot }
}
37 changes: 22 additions & 15 deletions ...nc-search/src/javaRestTest/java/org/elasticsearch/xpack/search/AsyncSearchSecurityIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,28 @@ public class AsyncSearchSecurityIT extends ESRestTestCase {
}

@ClassRule
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
.module("test-error-query")
.module("analysis-common")
.module("x-pack-async-search")
.setting("xpack.license.self_generated.type", "trial")
.setting("xpack.security.enabled", "true")
.rolesFile(Resource.fromClasspath("roles.yml"))
.user("test_kibana_user", "x-pack-test-password", "kibana_system", false)
.user("test-admin", "x-pack-test-password", "test-admin", false)
.user("user1", "x-pack-test-password", "user1", false)
.user("user2", "x-pack-test-password", "user2", false)
.user("user-dls", "x-pack-test-password", "user-dls", false)
.user("user-cancel", "x-pack-test-password", "user-cancel", false)
.user("user-monitor", "x-pack-test-password", "user-monitor", false)
.build();
public static ElasticsearchCluster cluster = getCluster();

private static ElasticsearchCluster getCluster() {
var builder = ElasticsearchCluster.local()
.module("analysis-common")
.module("x-pack-async-search")
.setting("xpack.license.self_generated.type", "trial")
.setting("xpack.security.enabled", "true")
.rolesFile(Resource.fromClasspath("roles.yml"))
.user("test_kibana_user", "x-pack-test-password", "kibana_system", false)
.user("test-admin", "x-pack-test-password", "test-admin", false)
.user("user1", "x-pack-test-password", "user1", false)
.user("user2", "x-pack-test-password", "user2", false)
.user("user-dls", "x-pack-test-password", "user-dls", false)
.user("user-cancel", "x-pack-test-password", "user-cancel", false)
.user("user-monitor", "x-pack-test-password", "user-monitor", false);
if (Build.current().isSnapshot()) {
// Only in non-release builds we can use the error_query
builder = builder.module("test-error-query");
}
return builder.build();
}

@Override
protected String getTestRestCluster() {
Expand Down