Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ML] Unmute BWC tests and fix version after backport of #50553 #50599

Merged
merged 2 commits into from
Jan 3, 2020
Merged

[ML] Unmute BWC tests and fix version after backport of #50553 #50599

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75a2825
[ML] Unmute BWC tests and fix version after backport of #50553
dimitris-athanasiou Jan 3, 2020
f7d3a61
Correct version and add bwc test for deletes
dimitris-athanasiou Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteDataFrameAnalyticsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static class Request extends AcknowledgedRequest<Request> {
public Request(StreamInput in) throws IOException {
super(in);
id = in.readString();
if (in.getVersion().onOrAfter(Version.CURRENT)) {
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since #50589 is merged, shouldn't the version be V_7_6_0?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since BWC has passed with the version being wrong, I am guessing we don't have a BWC test that deletes analytics jobs do we?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, 🤦‍♂

Indeed. I'll add one that creates and deletes a job in the mixed cluster.

force = in.readBoolean();
} else {
force = false;
Expand Down Expand Up @@ -82,7 +82,7 @@ public boolean equals(Object o) {
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
out.writeString(id);
if (out.getVersion().onOrAfter(Version.CURRENT)) {
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
out.writeBoolean(force);
}
}
Expand Down
5 changes: 0 additions & 5 deletions ...e/src/test/resources/rest-api-spec/test/mixed_cluster/90_ml_data_frame_analytics_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
setup:
- skip:
version: "all"
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/50553"

---
"Get old outlier_detection job":

Expand Down
3 changes: 0 additions & 3 deletions ...ade/src/test/resources/rest-api-spec/test/old_cluster/90_ml_data_frame_analytics_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
setup:
- skip:
version: "all"
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/50553"

- do:
index:
Expand Down
5 changes: 0 additions & 5 deletions ...rc/test/resources/rest-api-spec/test/upgraded_cluster/90_ml_data_frame_analytics_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
setup:
- skip:
version: "all"
reason: "Until backport of https://github.com/elastic/elasticsearch/issues/50553"

---
"Get old cluster outlier_detection job":

Expand Down