File tree Expand file tree Collapse file tree 4 files changed +1
-14
lines changed
src/main/java/org/elasticsearch/ingest/geoip
x-pack/qa/multi-project/core-rest-tests-with-multiple-projects
src/yamlRestTest/java/org/elasticsearch/multiproject/test Expand file tree Collapse file tree 4 files changed +1
-14
lines changed Original file line number Diff line number Diff line change @@ -85,16 +85,7 @@ tasks.named("dependencyLicenses").configure {
8585 ignoreFile ' elastic-geoip-database-service-agreement-LICENSE.txt'
8686}
8787
88- configurations {
89- basicRestSpecs {
90- attributes {
91- attribute(ArtifactTypeDefinition . ARTIFACT_TYPE_ATTRIBUTE , ArtifactTypeDefinition . DIRECTORY_TYPE )
92- }
93- }
94- }
95-
9688artifacts {
97- basicRestSpecs(new File (projectDir, " src/yamlRestTest/resources/rest-api-spec/test" ))
9889 restTests(new File (projectDir, " src/yamlRestTest/resources/rest-api-spec/test" ))
9990}
10091
Original file line number Diff line number Diff line change @@ -180,7 +180,7 @@ void updateDatabases() throws IOException {
180180 @ SuppressWarnings ("unchecked" )
181181 private <T > List <T > fetchDatabasesOverview () throws IOException {
182182 String url = endpoint + "?elastic_geoip_service_tos=agree" ;
183- logger .info ("fetching geoip databases overview from [{}]" , url );
183+ logger .debug ("fetching geoip databases overview from [{}]" , url );
184184 byte [] data = httpClient .getBytes (url );
185185 try (XContentParser parser = XContentType .JSON .xContent ().createParser (XContentParserConfiguration .EMPTY , data )) {
186186 return (List <T >) parser .list ();
Original file line number Diff line number Diff line change @@ -4,11 +4,9 @@ import org.elasticsearch.gradle.util.GradleUtils
44dependencies {
55 testImplementation project(' :x-pack:qa' )
66 testImplementation project(' :x-pack:qa:multi-project:yaml-test-framework' )
7- yamlRestTestImplementation project(' :test:fixtures:geoip-fixture' )
87 clusterModules project(' :modules:mapper-extras' )
98 clusterModules project(' :modules:rank-eval' )
109 clusterModules project(' :modules:ingest-common' )
11- clusterModules project(' :modules:ingest-geoip' )
1210 clusterModules project(' :modules:reindex' )
1311 clusterModules project(' :modules:analysis-common' )
1412 clusterModules project(' :modules:health-shards-availability' )
Original file line number Diff line number Diff line change @@ -37,15 +37,13 @@ public class CoreWithMultipleProjectsClientYamlTestSuiteIT extends MultipleProje
3737 .module ("test-multi-project" )
3838 .module ("lang-mustache" )
3939 .module ("parent-join" )
40- .module ("ingest-geoip" )
4140 .setting ("test.multi_project.enabled" , "true" )
4241 .setting ("xpack.security.enabled" , "true" )
4342 .setting ("xpack.watcher.enabled" , "false" )
4443 .setting ("xpack.ml.enabled" , "false" )
4544 .setting ("xpack.license.self_generated.type" , "trial" )
4645 .setting ("xpack.security.autoconfiguration.enabled" , "false" )
4746 .user (USER , PASS )
48- .systemProperty ("ingest.geoip.downloader.enabled.default" , "true" )
4947 .systemProperty ("es.queryable_built_in_roles_enabled" , "false" )
5048 .feature (FeatureFlag .TIME_SERIES_MODE )
5149 .nodes (2 )
You can’t perform that action at this time.
0 commit comments