Skip to content

Commit

Permalink
Drop BWC suppressions for composite aggs (elastic#50857)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
nik9000 authored Jan 10, 2020
1 parent f22631a commit dfccbf0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ setup:
---
"Composite aggregation with format":
- skip:
version: " - 7.99.99" # after BWC merged revert to 7.1.99
version: " - 7.1.99"
reason: calendar_interval introduced in 7.2.0
features: warnings

Expand Down Expand Up @@ -309,7 +309,7 @@ setup:
---
"Composite aggregation with format and calendar_interval":
- skip:
version: " - 7.99.99" # after BWC merged revert to 7.1.99
version: " - 7.1.99"
reason: calendar_interval introduced in 7.2.0

- do:
Expand Down Expand Up @@ -370,8 +370,8 @@ setup:
---
"Composite aggregation with date_histogram offset":
- skip:
version: " - 7.99.99" # after BWC merged revert to 7.5.99
reason: offset introduced in 8.0.0
version: " - 7.5.99"
reason: offset introduced in 7.6.0

- do:
search:
Expand Down
7 changes: 0 additions & 7 deletions x-pack/qa/rolling-upgrade/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,6 @@ for (Version bwcVersion : bwcVersions.wireCompatible) {
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
systemProperty 'tests.rest.suite', 'upgraded_cluster'
systemProperty 'tests.upgrade_from_version', bwcVersion.toString().replace('-SNAPSHOT', '')
// disabled temporarily for backporting serialization change
if (bwcVersion.before('8.0.0')) {
systemProperty 'tests.rest.blacklist', [
'upgraded_cluster/80_transform_jobs_crud/Get start, stop mixed cluster batch transform',
'upgraded_cluster/80_transform_jobs_crud/Test GET, mixed continuous transforms',
].join(',')
}
}

tasks.register("${baseName}#bwcTest") {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
---
"Test put batch transform on mixed cluster":
- skip:
version: " - 7.99.99" # after BWC merged then remove entirely
reason: disabled temporarily for backporting serialization change

- do:
cluster.health:
index: "transform-airline-data"
Expand Down Expand Up @@ -110,10 +106,6 @@

---
"Test put continuous transform on mixed cluster":
- skip:
version: " - 7.99.99" # after BWC merged then remove entirely
reason: disabled temporarily for backporting serialization change

- do:
cluster.health:
index: "transform-airline-data-cont"
Expand Down

0 comments on commit dfccbf0

Please sign in to comment.