Skip to content

Commit dfccbf0

Browse files
authored
Drop BWC suppressions for composite aggs (elastic#50857)
When I implemented elastic#50609 I suppressed a few backwards compatibility checks until I finished the backport. I've now finished the backport so this enables the tests.
1 parent f22631a commit dfccbf0

File tree

3 files changed

+4
-19
lines changed

3 files changed

+4
-19
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ setup:
243243
---
244244
"Composite aggregation with format":
245245
- skip:
246-
version: " - 7.99.99" # after BWC merged revert to 7.1.99
246+
version: " - 7.1.99"
247247
reason: calendar_interval introduced in 7.2.0
248248
features: warnings
249249

@@ -309,7 +309,7 @@ setup:
309309
---
310310
"Composite aggregation with format and calendar_interval":
311311
- skip:
312-
version: " - 7.99.99" # after BWC merged revert to 7.1.99
312+
version: " - 7.1.99"
313313
reason: calendar_interval introduced in 7.2.0
314314

315315
- do:
@@ -370,8 +370,8 @@ setup:
370370
---
371371
"Composite aggregation with date_histogram offset":
372372
- skip:
373-
version: " - 7.99.99" # after BWC merged revert to 7.5.99
374-
reason: offset introduced in 8.0.0
373+
version: " - 7.5.99"
374+
reason: offset introduced in 7.6.0
375375

376376
- do:
377377
search:

x-pack/qa/rolling-upgrade/build.gradle

-7
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,6 @@ for (Version bwcVersion : bwcVersions.wireCompatible) {
161161
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
162162
systemProperty 'tests.rest.suite', 'upgraded_cluster'
163163
systemProperty 'tests.upgrade_from_version', bwcVersion.toString().replace('-SNAPSHOT', '')
164-
// disabled temporarily for backporting serialization change
165-
if (bwcVersion.before('8.0.0')) {
166-
systemProperty 'tests.rest.blacklist', [
167-
'upgraded_cluster/80_transform_jobs_crud/Get start, stop mixed cluster batch transform',
168-
'upgraded_cluster/80_transform_jobs_crud/Test GET, mixed continuous transforms',
169-
].join(',')
170-
}
171164
}
172165

173166
tasks.register("${baseName}#bwcTest") {

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_transform_jobs_crud.yml

-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
---
22
"Test put batch transform on mixed cluster":
3-
- skip:
4-
version: " - 7.99.99" # after BWC merged then remove entirely
5-
reason: disabled temporarily for backporting serialization change
6-
73
- do:
84
cluster.health:
95
index: "transform-airline-data"
@@ -110,10 +106,6 @@
110106

111107
---
112108
"Test put continuous transform on mixed cluster":
113-
- skip:
114-
version: " - 7.99.99" # after BWC merged then remove entirely
115-
reason: disabled temporarily for backporting serialization change
116-
117109
- do:
118110
cluster.health:
119111
index: "transform-airline-data-cont"

0 commit comments

Comments
 (0)