Skip to content

Commit b5ae8ff

Browse files
edsavagejimczi
authored andcommitted
Re enable ml bwc tests (#32916)
[ML] Re-enabling BWC tests Re-enable BWC tests for ML now that #32816 has been backported to 6.x
1 parent 28b5ce5 commit b5ae8ff

File tree

7 files changed

+4
-38
lines changed

7 files changed

+4
-38
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisConfig.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,8 @@ public AnalysisConfig(StreamInput in) throws IOException {
162162
}
163163

164164
// BWC for removed per-partition normalization
165-
// Version check is temporarily against the latest to satisfy CI tests
166-
// TODO change to V_6_5_0 after successful backport to 6.x
167-
if (in.getVersion().before(Version.V_7_0_0_alpha1)) {
165+
// TODO Remove in 7.0.0
166+
if (in.getVersion().before(Version.V_6_5_0)) {
168167
in.readBoolean();
169168
}
170169
}
@@ -197,9 +196,8 @@ public void writeTo(StreamOutput out) throws IOException {
197196
}
198197

199198
// BWC for removed per-partition normalization
200-
// Version check is temporarily against the latest to satisfy CI tests
201-
// TODO change to V_6_5_0 after successful backport to 6.x
202-
if (out.getVersion().before(Version.V_7_0_0_alpha1)) {
199+
// TODO Remove in 7.0.0
200+
if (out.getVersion().before(Version.V_6_5_0)) {
203201
out.writeBoolean(false);
204202
}
205203
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
---
2-
setup:
3-
- skip:
4-
version: "all"
5-
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
6-
71
---
82
"Test get old cluster job":
93
- do:

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
---
2-
setup:
3-
- skip:
4-
version: "all"
5-
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
6-
71
---
82
"Test old cluster datafeed":
93
- do:

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
---
2-
setup:
3-
- skip:
4-
version: "all"
5-
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
6-
71
---
82
"Put job on the old cluster and post some data":
93

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
---
2-
setup:
3-
- skip:
4-
version: "all"
5-
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
6-
71
---
82
"Put job and datafeed in old cluster":
93

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
5-
62
- do:
73
cluster.health:
84
wait_for_status: green

x-pack/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"
5-
62
- do:
73
cluster.health:
84
wait_for_status: green

0 commit comments

Comments
 (0)