Merge branch 'main' into esql-telemetry

smalyshev · smalyshev · commit 58a72e119e66 · 2024-12-26T14:33:28.000-07:00
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -241,6 +241,9 @@ tests:
 - class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT
   method: test {yaml=indices.create/20_synthetic_source/create index with use_synthetic_source}
   issue: https://github.com/elastic/elasticsearch/issues/119191
+- class: org.elasticsearch.index.mapper.AbstractShapeGeometryFieldMapperTests
+  method: testCartesianBoundsBlockLoader
+  issue: https://github.com/elastic/elasticsearch/issues/119201
 
 # Examples:
 #
diff --git a/x-pack/qa/third-party/active-directory/build.gradle b/x-pack/qa/third-party/active-directory/build.gradle
@@ -29,4 +29,8 @@ tasks.named("test").configure {
   systemProperty 'tests.security.manager', 'false'
   include '**/*IT.class'
   include '**/*Tests.class'
+
+  // Limit how many concurrent docker test fixtures we are running
+  maxParallelForks = 1
+  forkEvery = 1
 }

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,9 @@ tests:`
`241`	`241`	`- class: org.elasticsearch.smoketest.SmokeTestMultiNodeClientYamlTestSuiteIT`
`242`	`242`	`method: test {yaml=indices.create/20_synthetic_source/create index with use_synthetic_source}`
`243`	`243`	`issue: https://github.com/elastic/elasticsearch/issues/119191`
	`244`	`+- class: org.elasticsearch.index.mapper.AbstractShapeGeometryFieldMapperTests`
	`245`	`+ method: testCartesianBoundsBlockLoader`
	`246`	`+ issue: https://github.com/elastic/elasticsearch/issues/119201`
`244`	`247`
`245`	`248`	`# Examples:`
`246`	`249`	`#`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,8 @@ tasks.named("test").configure {`
`29`	`29`	`systemProperty 'tests.security.manager', 'false'`
`30`	`30`	`include '*/IT.class'`
`31`	`31`	`include '*/Tests.class'`
	`32`	`+`
	`33`	`+ // Limit how many concurrent docker test fixtures we are running`
	`34`	`+ maxParallelForks = 1`
	`35`	`+ forkEvery = 1`
`32`	`36`	`}`