Skip to content

Commit 350381a

Browse files
Merge branch 'main' into sa-fix-and-unmute-tests
2 parents 903d305 + 9ad3f68 commit 350381a

File tree

3 files changed

+5
-41
lines changed

3 files changed

+5
-41
lines changed

.buildkite/scripts/dra-workflow.trigger.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ echo "steps:"
77
source .buildkite/scripts/branches.sh
88

99
for BRANCH in "${BRANCHES[@]}"; do
10-
if [[ "$BRANCH" == "main" ]]; then
11-
export VERSION_QUALIFIER="alpha1"
10+
if [[ "$BRANCH" == "9.0" ]]; then
11+
export VERSION_QUALIFIER="beta1"
1212
fi
1313

1414
INTAKE_PIPELINE_SLUG="elasticsearch-intake"

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,9 @@ tests:
340340
issue: https://github.com/elastic/elasticsearch/issues/121293
341341
- class: org.elasticsearch.xpack.inference.common.InferenceServiceNodeLocalRateLimitCalculatorTests
342342
issue: https://github.com/elastic/elasticsearch/issues/121294
343+
- class: org.elasticsearch.env.NodeEnvironmentTests
344+
method: testGetBestDowngradeVersion
345+
issue: https://github.com/elastic/elasticsearch/issues/121316
343346

344347
# Examples:
345348
#

rest-api-spec/build.gradle

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -62,33 +62,7 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
6262
task.skipTest("cat.aliases/10_basic/Deprecated local parameter", "CAT APIs not covered by compatibility policy")
6363
task.skipTest("cat.shards/10_basic/Help", "sync_id is removed in 9.0")
6464
task.skipTest("search/500_date_range/from, to, include_lower, include_upper deprecated", "deprecated parameters are removed in 9.0")
65-
task.skipTest("logsdb/10_settings/logsdb with default ignore dynamic beyond limit and default sorting", "skip until pr/118968 gets backported")
66-
task.skipTest("logsdb/10_settings/logsdb with default ignore dynamic beyond limit and too low limit", "skip until pr/118968 gets backported")
67-
task.skipTest("logsdb/10_settings/logsdb with default ignore dynamic beyond limit and subobjects false", "skip until pr/118968 gets backported")
68-
task.skipTest("logsdb/10_settings/override sort missing settings", "skip until pr/118968 gets backported")
69-
task.skipTest("logsdb/10_settings/override sort order settings", "skip until pr/118968 gets backported")
70-
task.skipTest("logsdb/10_settings/override sort mode settings", "skip until pr/118968 gets backported")
71-
task.skipTest("search.vectors/41_knn_search_bbq_hnsw/Test knn search", "Scoring has changed in latest versions")
72-
task.skipTest("search.vectors/42_knn_search_bbq_flat/Test knn search", "Scoring has changed in latest versions")
73-
task.skipTest("search.vectors/180_update_dense_vector_type/Test create and update dense vector mapping with bulk indexing", "waiting for #118774 backport")
74-
task.skipTest("search.vectors/160_knn_query_missing_params/kNN query in a bool clause - missing num_candidates", "waiting for #118774 backport")
75-
task.skipTest("search.vectors/110_knn_query_with_filter/Simple knn query", "waiting for #118774 backport")
76-
task.skipTest("search.vectors/160_knn_query_missing_params/kNN search used in nested field - missing num_candidates", "waiting for #118774 backport")
77-
task.skipTest("search.vectors/180_update_dense_vector_type/Test create and update dense vector mapping to int4 with per-doc indexing and flush", "waiting for #118774 backport")
78-
task.skipTest("search.vectors/110_knn_query_with_filter/PRE_FILTER: knn query with internal filter as pre-filter", "waiting for #118774 backport")
79-
task.skipTest("search.vectors/180_update_dense_vector_type/Index, update and merge", "waiting for #118774 backport")
80-
task.skipTest("search.vectors/160_knn_query_missing_params/kNN query with missing num_candidates param - size provided", "waiting for #118774 backport")
81-
task.skipTest("search.vectors/110_knn_query_with_filter/POST_FILTER: knn query with filter from a parent bool query as post-filter", "waiting for #118774 backport")
82-
task.skipTest("search.vectors/120_knn_query_multiple_shards/Aggregations with collected number of docs depends on num_candidates", "waiting for #118774 backport")
83-
task.skipTest("search.vectors/180_update_dense_vector_type/Test create and update dense vector mapping with per-doc indexing and flush", "waiting for #118774 backport")
84-
task.skipTest("search.vectors/110_knn_query_with_filter/PRE_FILTER: knn query with alias filter as pre-filter", "waiting for #118774 backport")
85-
task.skipTest("search.vectors/140_knn_query_with_other_queries/Function score query with knn query", "waiting for #118774 backport")
86-
task.skipTest("search.vectors/130_knn_query_nested_search/nested kNN search inner_hits size > 1", "waiting for #118774 backport")
87-
task.skipTest("search.vectors/110_knn_query_with_filter/PRE_FILTER: pre-filter across multiple aliases", "waiting for #118774 backport")
88-
task.skipTest("search.vectors/160_knn_query_missing_params/kNN search in a dis_max query - missing num_candidates", "waiting for #118774 backport")
8965
task.skipTest("search.highlight/30_max_analyzed_offset/Plain highlighter with max_analyzed_offset < 0 should FAIL", "semantics of test has changed")
90-
task.skipTest("indices.create/10_basic/Create lookup index", "default auto_expand_replicas was removed")
91-
task.skipTest("indices.create/10_basic/Create lookup index with one shard", "default auto_expand_replicas was removed")
9266
task.skipTest("range/20_synthetic_source/Double range", "_source.mode mapping attribute is no-op since 9.0.0")
9367
task.skipTest("range/20_synthetic_source/Float range", "_source.mode mapping attribute is no-op since 9.0.0")
9468
task.skipTest("range/20_synthetic_source/Integer range", "_source.mode mapping attribute is no-op since 9.0.0")
@@ -99,17 +73,4 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
9973
task.skipTest("index/92_metrics_auto_subobjects/Root without subobjects with synthetic source", "_source.mode mapping attribute is no-op since 9.0.0")
10074
task.skipTest("index/91_metrics_no_subobjects/Metrics object indexing with synthetic source", "_source.mode mapping attribute is no-op since 9.0.0")
10175
task.skipTest("index/91_metrics_no_subobjects/Root without subobjects with synthetic source", "_source.mode mapping attribute is no-op since 9.0.0")
102-
task.skipTest("logsdb/10_settings/routing path allowed in logs mode with routing on sort fields", "Unknown feature routing.logsb_route_on_sort_fields")
103-
104-
task.skipTest("search/520_fetch_fields/fetch _seq_no via fields", "Skip until versioning between 8.x and 9.x is restored")
105-
task.skipTest("search/90_search_after/_shard_doc sort", "Skip until versioning between 8.x and 9.x is restored")
106-
task.skipTest("tsdb/90_unsupported_operations/search with routing", "Skip until versioning between 8.x and 9.x is restored")
107-
task.skipTest("tsdb/90_unsupported_operations/noop update", "Skip until versioning between 8.x and 9.x is restored")
108-
task.skipTest("tsdb/80_index_resize/split", "Skip until versioning between 8.x and 9.x is restored")
109-
task.skipTest("tsdb/90_unsupported_operations/index with routing over _bulk", "Skip until versioning between 8.x and 9.x is restored")
110-
task.skipTest("tsdb/90_unsupported_operations/index with routing", "Skip until versioning between 8.x and 9.x is restored")
111-
task.skipTest("tsdb/90_unsupported_operations/update over _bulk", "Skip until versioning between 8.x and 9.x is restored")
112-
task.skipTest("tsdb/90_unsupported_operations/regular update", "Skip until versioning between 8.x and 9.x is restored")
113-
task.skipTest("tsdb/25_id_generation/delete over _bulk", "Skip until versioning between 8.x and 9.x is restored")
114-
task.skipTest("tsdb/20_mapping/exact match object type", "Skip until versioning between 8.x and 9.x is restored")
11576
})

0 commit comments

Comments
 (0)