Skip to content

Commit 96502e3

Browse files
fix: gate yaml test execution
1 parent c140cfb commit 96502e3

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

rest-api-spec/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,4 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
7474
task.skipTest("index/91_metrics_no_subobjects/Metrics object indexing with synthetic source", "_source.mode mapping attribute is no-op since 9.0.0")
7575
task.skipTest("index/91_metrics_no_subobjects/Root without subobjects with synthetic source", "_source.mode mapping attribute is no-op since 9.0.0")
7676
task.skipTest("indices.create/20_synthetic_source/synthetic_source with copy_to inside nested object", "temporary until backported")
77-
task.skipTest("update/10_synthetic_source/keyword", "synthetic source recovery behind a feature flag and not enabled in release builds")
78-
task.skipTest("update/10_synthetic_source/stored text", "synthetic source recovery behind a feature flag and not enabled in release builds")
7977
})

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/update/100_synthetic_source.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ setup:
66
---
77
keyword:
88
- requires:
9-
cluster_features: [ "mapper.synthetic_recovery_source" ]
9+
cluster_features: [ "index.recovery.synthetic_source" ]
1010
reason: requires synthetic recovery source
1111

1212
- do:
@@ -66,7 +66,7 @@ keyword:
6666
---
6767
stored text:
6868
- requires:
69-
cluster_features: [ "mapper.synthetic_recovery_source" ]
69+
cluster_features: [ "index.recovery.synthetic_source" ]
7070
reason: requires synthetic recovery source
7171

7272
- do:

server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class MapperFeatures implements FeatureSpecification {
3131
public static final NodeFeature SPARSE_VECTOR_STORE_SUPPORT = new NodeFeature("mapper.sparse_vector.store_support");
3232
public static final NodeFeature SORT_FIELDS_CHECK_FOR_NESTED_OBJECT_FIX = new NodeFeature("mapper.nested.sorting_fields_check_fix");
3333
public static final NodeFeature DYNAMIC_HANDLING_IN_COPY_TO = new NodeFeature("mapper.copy_to.dynamic_handling");
34+
public static final NodeFeature SYNTHETIC_SOURCE_RECOVERY = new NodeFeature("index.recovery.synthetic_source");
3435

3536
@Override
3637
public Set<NodeFeature> getTestFeatures() {
@@ -50,7 +51,8 @@ public Set<NodeFeature> getTestFeatures() {
5051
SORT_FIELDS_CHECK_FOR_NESTED_OBJECT_FIX,
5152
DYNAMIC_HANDLING_IN_COPY_TO,
5253
SourceFieldMapper.SYNTHETIC_RECOVERY_SOURCE,
53-
ObjectMapper.SUBOBJECTS_FALSE_MAPPING_UPDATE_FIX
54+
ObjectMapper.SUBOBJECTS_FALSE_MAPPING_UPDATE_FIX,
55+
SYNTHETIC_SOURCE_RECOVERY
5456
);
5557
}
5658
}

x-pack/plugin/logsdb/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,4 @@ tasks.named('yamlRestTest') {
4343
usesDefaultDistribution()
4444
}
4545

46-
tasks.named("yamlRestTest").configure ({ task ->
47-
task.skipTest("/60_synthetic_source_recovery/synthetic recovery for time_series index", "synthetic source recovery behind a feature flag and not enabled in release builds")
48-
task.skipTest("/60_synthetic_source_recovery/synthetic recovery for synthetic source mode index", "synthetic source recovery behind a feature flag and not enabled in release builds")
49-
task.skipTest("/60_synthetic_source_recovery/synthetic recovery for logsdb index", "synthetic source recovery behind a feature flag and not enabled in release builds")
50-
})
46+

x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/60_synthetic_source_recovery.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
synthetic recovery for synthetic source mode index:
33
- requires:
4-
cluster_features: [ "mapper.synthetic_recovery_source" ]
4+
cluster_features: [ "index.recovery.synthetic_source" ]
55
reason: requires synthetic recovery source
66

77
- do:
@@ -88,7 +88,7 @@ synthetic recovery for standard index:
8888
---
8989
synthetic recovery for logsdb index:
9090
- requires:
91-
cluster_features: [ "mapper.synthetic_recovery_source" ]
91+
cluster_features: [ "index.recovery.synthetic_source" ]
9292
reason: requires synthetic recovery source
9393

9494
- do:
@@ -109,7 +109,7 @@ synthetic recovery for logsdb index:
109109
---
110110
synthetic recovery for time_series index:
111111
- requires:
112-
cluster_features: [ "mapper.synthetic_recovery_source" ]
112+
cluster_features: [ "index.recovery.synthetic_source" ]
113113
reason: requires synthetic recovery source
114114

115115
- do:

0 commit comments

Comments
 (0)