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

Jump to bottom

Re enable ml bwc tests #32916

Merged
merged 2 commits into from
Aug 16, 2018
+4 −38
Merged

Re enable ml bwc tests #32916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc6a256
[ML] Re-enabling BWC tests
edsavage Aug 16, 2018
19c7bb8
Updated comments re version
edsavage Aug 16, 2018
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
10 changes: 4 additions & 6 deletions .../plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/AnalysisConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,8 @@ public AnalysisConfig(StreamInput in) throws IOException {
}

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

// BWC for removed per-partition normalization
// Version check is temporarily against the latest to satisfy CI tests
// TODO change to V_6_5_0 after successful backport to 6.x
if (out.getVersion().before(Version.V_7_0_0_alpha1)) {
// TODO Remove in 7.0.0
if (out.getVersion().before(Version.V_6_5_0)) {
out.writeBoolean(false);
}
}
Expand Down
6 changes: 0 additions & 6 deletions ...a/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/30_ml_jobs_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
---
setup:
- skip:
version: "all"
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"

---
"Test get old cluster job":
- do:
Expand Down
6 changes: 0 additions & 6 deletions ...lling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/40_ml_datafeed_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
---
setup:
- skip:
version: "all"
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"

---
"Test old cluster datafeed":
- do:
Expand Down
6 changes: 0 additions & 6 deletions .../qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/30_ml_jobs_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
---
setup:
- skip:
version: "all"
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"

---
"Put job on the old cluster and post some data":

Expand Down
6 changes: 0 additions & 6 deletions ...rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/40_ml_datafeed_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
---
setup:
- skip:
version: "all"
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"

---
"Put job and datafeed in old cluster":

Expand Down
4 changes: 0 additions & 4 deletions ...olling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/30_ml_jobs_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
setup:
- skip:
version: "all"
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"

- do:
cluster.health:
wait_for_status: green
Expand Down
4 changes: 0 additions & 4 deletions ...ng-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/40_ml_datafeed_crud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
setup:
- skip:
version: "all"
reason: "Temporarily disabled while backporting https://github.com/elastic/elasticsearch/pull/32816"

- do:
cluster.health:
wait_for_status: green
Expand Down