Skip to content

Commit e22ce5a

Browse files
authored
[ML][Data Frame] enable bwc tests again, adjusting after backport (elastic#44720)
1 parent 36f64a3 commit e22ce5a

File tree

5 files changed

+4
-28
lines changed

5 files changed

+4
-28
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/DeleteDataFrameTransformAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public Request(String id, boolean force) {
3939
public Request(StreamInput in) throws IOException {
4040
super(in);
4141
id = in.readString();
42-
if (in.getVersion().onOrAfter(Version.CURRENT)) {
42+
if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
4343
force = in.readBoolean();
4444
} else {
4545
force = false;
@@ -58,7 +58,7 @@ public boolean isForce() {
5858
public void writeTo(StreamOutput out) throws IOException {
5959
super.writeTo(out);
6060
out.writeString(id);
61-
if (out.getVersion().onOrAfter(Version.CURRENT)) {
61+
if (out.getVersion().onOrAfter(Version.V_7_4_0)) {
6262
out.writeBoolean(force);
6363
}
6464
}

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/dataframe/action/PutDataFrameTransformAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public Request(DataFrameTransformConfig config, boolean deferValidation) {
5353
public Request(StreamInput in) throws IOException {
5454
super(in);
5555
this.config = new DataFrameTransformConfig(in);
56-
if (in.getVersion().onOrAfter(Version.CURRENT)) {
56+
if (in.getVersion().onOrAfter(Version.V_7_4_0)) {
5757
this.deferValidation = in.readBoolean();
5858
} else {
5959
this.deferValidation = false;
@@ -129,7 +129,7 @@ public boolean isDeferValidation() {
129129
public void writeTo(StreamOutput out) throws IOException {
130130
super.writeTo(out);
131131
this.config.writeTo(out);
132-
if (out.getVersion().onOrAfter(Version.CURRENT)) {
132+
if (out.getVersion().onOrAfter(Version.V_7_4_0)) {
133133
out.writeBoolean(this.deferValidation);
134134
}
135135
}

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
22
"Test put batch data frame transforms on mixed cluster":
3-
- skip:
4-
version: "7.4.0 - "
5-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
63
- do:
74
cluster.health:
85
index: "dataframe-transform-airline-data"
@@ -121,9 +118,6 @@
121118

122119
---
123120
"Test put continuous data frame transform on mixed cluster":
124-
- skip:
125-
version: "7.4.0 - "
126-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
127121
- do:
128122
cluster.health:
129123
index: "dataframe-transform-airline-data-cont"
@@ -192,9 +186,6 @@
192186

193187
---
194188
"Test GET, start, and stop old cluster batch transforms":
195-
- skip:
196-
version: "7.4.0 - "
197-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
198189
- do:
199190
cluster.health:
200191
index: "dataframe-transform-airline-data"
@@ -284,9 +275,6 @@
284275

285276
---
286277
"Test GET, stop, start, old continuous transforms":
287-
- skip:
288-
version: "7.4.0 - "
289-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
290278
- do:
291279
cluster.health:
292280
index: "dataframe-transform-airline-data-cont"

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
22
"Test put batch data frame transforms on old cluster":
3-
- skip:
4-
version: "7.4.0 - "
5-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
63
- do:
74
indices.create:
85
index: dataframe-transform-airline-data
@@ -139,9 +136,6 @@
139136

140137
---
141138
"Test put continuous data frame transform on old cluster":
142-
- skip:
143-
version: "7.4.0 - "
144-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
145139
- do:
146140
indices.create:
147141
index: dataframe-transform-airline-data-cont

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ setup:
77
timeout: 70s
88
---
99
"Get start, stop, and delete old and mixed cluster batch data frame transforms":
10-
- skip:
11-
version: "7.4.0 - "
12-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
1310
# Simple and complex OLD transforms
1411
- do:
1512
data_frame.get_data_frame_transform:
@@ -165,9 +162,6 @@ setup:
165162

166163
---
167164
"Test GET, stop, delete, old and mixed continuous transforms":
168-
- skip:
169-
version: "7.4.0 - "
170-
reason: waiting backport of https://github.com/elastic/elasticsearch/pull/44590
171165
- do:
172166
data_frame.get_data_frame_transform:
173167
transform_id: "old-simple-continuous-transform"

0 commit comments

Comments
 (0)