Skip to content

Commit da002a9

Browse files
prwhelanprwhelan
authored
Merge branch 'main' into fix/133135-1
2 parents ce32cdf + 4311844 commit da002a9

File tree

4 files changed

+7
-67
lines changed

4 files changed

+7
-67
lines changed

‎.buildkite/pipelines/periodic.template.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ steps:
246246
image: family/elasticsearch-ubuntu-2404
247247
machineType: n2-standard-8
248248
buildDirectory: /dev/shm/bk
249-
if: build.branch =~ /^(main|\d+\.\d+|\d+\.x)$/
249+
if: build.branch =~ /^(main|\d+\.\d+|\d+\.x)$$/
250250
- label: check-branch-consistency
251251
command: .ci/scripts/run-gradle.sh branchConsistency
252252
timeout_in_minutes: 15

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ steps:
684684
image: family/elasticsearch-ubuntu-2404
685685
machineType: n2-standard-8
686686
buildDirectory: /dev/shm/bk
687-
if: build.branch =~ /^(main|\d+\.\d+|\d+\.x)$/
687+
if: build.branch =~ /^(main|\d+\.\d+|\d+\.x)$$/
688688
- label: check-branch-consistency
689689
command: .ci/scripts/run-gradle.sh branchConsistency
690690
timeout_in_minutes: 15

‎muted-tests.yml‎

Lines changed: 3 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,6 @@ tests:
402402
- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
403403
method: testWatcherWithApiKey {cluster=UPGRADED}
404404
issue: https://github.com/elastic/elasticsearch/issues/131964
405-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
406-
method: test {p0=search/600_flattened_ignore_above/flattened ignore_above multi-value field}
407-
issue: https://github.com/elastic/elasticsearch/issues/131967
408405
- class: org.elasticsearch.test.rest.yaml.MDPYamlTestSuiteIT
409406
method: test {yaml=mdp/10_basic/Index using shared data path}
410407
issue: https://github.com/elastic/elasticsearch/issues/132223
@@ -447,18 +444,6 @@ tests:
447444
- class: org.elasticsearch.reservedstate.service.FileSettingsServiceIT
448445
method: testSettingsAppliedOnStart
449446
issue: https://github.com/elastic/elasticsearch/issues/131210
450-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
451-
method: test {p0=search/160_exists_query/Test exists query on mapped date field with no doc values}
452-
issue: https://github.com/elastic/elasticsearch/issues/132828
453-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
454-
method: test {p0=search/160_exists_query/Test exists query on keyword field in empty index}
455-
issue: https://github.com/elastic/elasticsearch/issues/132829
456-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
457-
method: test {p0=search.vectors/40_knn_search_cosine/kNN search only regular query}
458-
issue: https://github.com/elastic/elasticsearch/issues/132890
459-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
460-
method: test {p0=search/410_named_queries/named_queries_with_score}
461-
issue: https://github.com/elastic/elasticsearch/issues/132906
462447
- class: org.elasticsearch.packaging.test.ArchiveGenerateInitialCredentialsTests
463448
method: test40VerifyAutogeneratedCredentials
464449
issue: https://github.com/elastic/elasticsearch/issues/132877
@@ -483,63 +468,24 @@ tests:
483468
- class: org.elasticsearch.cluster.ClusterInfoServiceIT
484469
method: testMaxQueueLatenciesInClusterInfo
485470
issue: https://github.com/elastic/elasticsearch/issues/132957
486-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
487-
method: test {p0=search/400_synthetic_source/_doc_count}
488-
issue: https://github.com/elastic/elasticsearch/issues/132965
489-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
490-
method: test {p0=search/160_exists_query/Test exists query on unmapped float field}
491-
issue: https://github.com/elastic/elasticsearch/issues/132984
492471
- class: org.elasticsearch.xpack.search.AsyncSearchErrorTraceIT
493472
method: testAsyncSearchFailingQueryErrorTraceDefault
494473
issue: https://github.com/elastic/elasticsearch/issues/133010
495-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
496-
method: test {p0=search/510_range_query_out_of_bounds/Test range query for float field with out of bounds lower limit}
497-
issue: https://github.com/elastic/elasticsearch/issues/133012
498-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
499-
method: test {p0=field_caps/10_basic/Field caps for boolean field with only doc values}
500-
issue: https://github.com/elastic/elasticsearch/issues/133019
501-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
502-
method: test {p0=search/160_exists_query/Test exists query on unmapped boolean field}
503-
issue: https://github.com/elastic/elasticsearch/issues/133029
504-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
505-
method: test {p0=search.vectors/45_knn_search_bit/Vector similarity with filter only}
506-
issue: https://github.com/elastic/elasticsearch/issues/133037
507-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
508-
method: test {p0=search.vectors/45_knn_search_bit/Vector rescoring has no effect for non-quantized vectors and provides same results as non-rescored knn}
509-
issue: https://github.com/elastic/elasticsearch/issues/133039
510-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
511-
method: test {p0=search.highlight/50_synthetic_source/text multi fvh source order}
512-
issue: https://github.com/elastic/elasticsearch/issues/133056
513474
- class: org.elasticsearch.upgrades.SyntheticSourceRollingUpgradeIT
514475
method: testIndexing {upgradedNodes=1}
515476
issue: https://github.com/elastic/elasticsearch/issues/133060
516477
- class: org.elasticsearch.upgrades.SyntheticSourceRollingUpgradeIT
517478
method: testIndexing {upgradedNodes=0}
518479
issue: https://github.com/elastic/elasticsearch/issues/133061
519-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
520-
method: test {p0=search/160_exists_query/Test exists query on _id field}
521-
issue: https://github.com/elastic/elasticsearch/issues/133097
522480
- class: org.elasticsearch.xpack.ml.integration.TextEmbeddingQueryIT
523481
method: testModelWithPrefixStrings
524482
issue: https://github.com/elastic/elasticsearch/issues/133138
525-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
526-
method: test {p0=search.vectors/45_knn_search_byte/Vector rescoring has no effect for non-quantized vectors and provides same results as non-rescored knn}
527-
issue: https://github.com/elastic/elasticsearch/issues/133187
528-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
529-
method: test {p0=search.vectors/100_knn_nested_search/nested kNN search inner_hits & profiling}
530-
issue: https://github.com/elastic/elasticsearch/issues/133273
531483
- class: org.elasticsearch.xpack.security.authc.AuthenticationServiceTests
532484
method: testInvalidToken
533485
issue: https://github.com/elastic/elasticsearch/issues/133328
534-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
535-
method: test {p0=search/160_exists_query/Test exists query on unmapped byte field}
536-
issue: https://github.com/elastic/elasticsearch/issues/133331
537486
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
538487
method: test {csv-spec:change_point.Values null column}
539488
issue: https://github.com/elastic/elasticsearch/issues/133334
540-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
541-
method: test {p0=search/110_field_collapsing/field collapsing}
542-
issue: https://github.com/elastic/elasticsearch/issues/133361
543489
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
544490
method: test {csv-spec:spatial.ConvertFromStringParseError}
545491
issue: https://github.com/elastic/elasticsearch/issues/133364
@@ -549,12 +495,6 @@ tests:
549495
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
550496
method: testCCSClusterDetailsWhereAllShardsSkippedInCanMatch
551497
issue: https://github.com/elastic/elasticsearch/issues/133370
552-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
553-
method: test {p0=search.vectors/42_knn_search_int4_flat/kNN search with filter}
554-
issue: https://github.com/elastic/elasticsearch/issues/133420
555-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
556-
method: test {p0=search/160_exists_query/Test exists query on date field in empty index}
557-
issue: https://github.com/elastic/elasticsearch/issues/133439
558498
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
559499
method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version}
560500
issue: https://github.com/elastic/elasticsearch/issues/133449
@@ -576,9 +516,6 @@ tests:
576516
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
577517
method: test {csv-spec:spatial.ConvertFromStringParseError}
578518
issue: https://github.com/elastic/elasticsearch/issues/133507
579-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
580-
method: test {p0=search/10_source_filtering/no filtering}
581-
issue: https://github.com/elastic/elasticsearch/issues/133561
582519
- class: org.elasticsearch.compute.data.BasicBlockTests
583520
method: testIntBlock
584521
issue: https://github.com/elastic/elasticsearch/issues/133596
@@ -606,6 +543,9 @@ tests:
606543
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
607544
method: test
608545
issue: https://github.com/elastic/elasticsearch/issues/133077
546+
- class: org.elasticsearch.compute.aggregation.LossySumDoubleGroupingAggregatorFunctionTests
547+
method: testManyInitialManyPartialFinalRunner
548+
issue: https://github.com/elastic/elasticsearch/issues/133809
609549

610550
# Examples:
611551
#

‎x-pack/plugin/src/test/java/org/elasticsearch/xpack/test/rest/AbstractXPackRestTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ public void cleanup() throws Exception {
125125

126126
protected Predicate<String> waitForPendingTasksFilter() {
127127
return task -> {
128-
// Don't check rollup jobs because we clear them in the superclass.
129-
return task.contains(RollupJob.NAME);
128+
// Don't check rollup jobs or data stream reindex tasks because we clear them in the superclass.
129+
return task.contains(RollupJob.NAME) || task.contains("reindex-data-stream");
130130
};
131131
}
132132

0 commit comments

Comments
 (0)