Skip to content

Commit 0dc4b31

Browse files
[ML] Unmute BWC tests and fix version after backport of #50553 (#50599)
Relates #50553
1 parent 675b98f commit 0dc4b31

File tree

4 files changed

+25
-15
lines changed

4 files changed

+25
-15
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteDataFrameAnalyticsAction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static class Request extends AcknowledgedRequest<Request> {
4040
public Request(StreamInput in) throws IOException {
4141
super(in);
4242
id = in.readString();
43-
if (in.getVersion().onOrAfter(Version.CURRENT)) {
43+
if (in.getVersion().onOrAfter(Version.V_7_6_0)) {
4444
force = in.readBoolean();
4545
} else {
4646
force = false;
@@ -82,7 +82,7 @@ public boolean equals(Object o) {
8282
public void writeTo(StreamOutput out) throws IOException {
8383
super.writeTo(out);
8484
out.writeString(id);
85-
if (out.getVersion().onOrAfter(Version.CURRENT)) {
85+
if (out.getVersion().onOrAfter(Version.V_7_6_0)) {
8686
out.writeBoolean(force);
8787
}
8888
}

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

+23-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/50553"
5-
61
---
72
"Get old outlier_detection job":
83

@@ -148,3 +143,26 @@ setup:
148143
- match: { count: 1 }
149144
- match: { data_frame_analytics.0.id: "mixed_cluster_outlier_detection_job" }
150145
- match: { data_frame_analytics.0.state: "stopped" }
146+
147+
---
148+
"Put and delete a job":
149+
150+
- do:
151+
ml.put_data_frame_analytics:
152+
id: "mixed_cluster_job_to_delete"
153+
body: >
154+
{
155+
"source": {
156+
"index": "bwc_ml_outlier_detection_job_source"
157+
},
158+
"dest": {
159+
"index": "mixed_cluster_job_to_delete_results"
160+
},
161+
"analysis": {"outlier_detection":{}}
162+
}
163+
- match: { id: "mixed_cluster_job_to_delete" }
164+
165+
- do:
166+
ml.delete_data_frame_analytics:
167+
id: mixed_cluster_job_to_delete
168+
- match: { acknowledged: true }

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

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/50553"
52

63
- do:
74
index:

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

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
setup:
2-
- skip:
3-
version: "all"
4-
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/50553"
5-
61
---
72
"Get old cluster outlier_detection job":
83

0 commit comments

Comments
 (0)