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][Data Frame] enable bwc tests again, adjusting after backport #44720

Merged
merged 1 commit into from
Jul 23, 2019
Merged

[ML][Data Frame] enable bwc tests again, adjusting after backport #44720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...in/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public Request(String id, boolean force) {
public Request(StreamInput in) throws IOException {
super(in);
id = in.readString();
if (in.getVersion().onOrAfter(Version.CURRENT)) {
if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
force = in.readBoolean();
} else {
force = false;
Expand All @@ -58,7 +58,7 @@ public boolean isForce() {
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_7_4_0)) {
out.writeBoolean(force);
}
}
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public Request(DataFrameTransformConfig config, boolean deferValidation) {
public Request(StreamInput in) throws IOException {
super(in);
this.config = new DataFrameTransformConfig(in);
if (in.getVersion().onOrAfter(Version.CURRENT)) {
if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
this.deferValidation = in.readBoolean();
} else {
this.deferValidation = false;
Expand Down Expand Up @@ -129,7 +129,7 @@ public boolean isDeferValidation() {
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
this.config.writeTo(out);
if (out.getVersion().onOrAfter(Version.CURRENT)) {
if (out.getVersion().onOrAfter(Version.V_7_4_0)) {
out.writeBoolean(this.deferValidation);
}
}
Expand Down
12 changes: 0 additions & 12 deletions ...g-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/80_data_frame_jobs_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
---
"Test put batch data frame transforms on mixed cluster":
- skip:
version: "7.4.0 - "
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
- do:
cluster.health:
index: "dataframe-transform-airline-data"
Expand Down Expand Up @@ -111,9 +108,6 @@

---
"Test put continuous data frame transform on mixed cluster":
- skip:
version: "7.4.0 - "
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
- do:
cluster.health:
index: "dataframe-transform-airline-data-cont"
Expand Down Expand Up @@ -177,9 +171,6 @@

---
"Test GET, start, and stop old cluster batch transforms":
- skip:
version: "7.4.0 - "
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
- do:
cluster.health:
index: "dataframe-transform-airline-data"
Expand Down Expand Up @@ -259,9 +250,6 @@

---
"Test GET, stop, start, old continuous transforms":
- skip:
version: "7.4.0 - "
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
- do:
cluster.health:
index: "dataframe-transform-airline-data-cont"
Expand Down
6 changes: 0 additions & 6 deletions ...ing-upgrade/src/test/resources/rest-api-spec/test/old_cluster/80_data_frame_jobs_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
---
"Test put batch data frame transforms on old cluster":
- skip:
version: "7.4.0 - "
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
- do:
indices.create:
index: dataframe-transform-airline-data
Expand Down Expand Up @@ -145,9 +142,6 @@

---
"Test put continuous data frame transform on old cluster":
- skip:
version: "7.4.0 - "
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
- do:
indices.create:
index: dataframe-transform-airline-data-cont
Expand Down
6 changes: 0 additions & 6 deletions ...pgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/80_data_frame_jobs_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ setup:
timeout: 70s
---
"Get start, stop, and delete old and mixed cluster batch data frame transforms":
- skip:
version: "7.4.0 - "
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
# Simple and complex OLD transforms
- do:
data_frame.get_data_frame_transform:
Expand Down Expand Up @@ -169,9 +166,6 @@ setup:

---
"Test GET, stop, delete, old and mixed continuous transforms":
- skip:
version: "7.4.0 - "
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
- do:
data_frame.get_data_frame_transform:
transform_id: "old-simple-continuous-transform"
Expand Down