Skip to content

re-enable bwc tests and update cat.alias rest tests #45822

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

Merged
merged 2 commits into from
Aug 21, 2019
Merged

re-enable bwc tests and update cat.alias rest tests #45822

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
0ea6bbb
correct version bounds to 7.4
talevy Aug 21, 2019
c70d71f
re-enable bwc tests
talevy Aug 21, 2019
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 build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ task verifyVersions {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = false
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/45798" /* place a PR link here when committing bwc changes */
boolean bwc_tests_enabled = true
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
if (bwc_tests_enabled == false) {
if (bwc_tests_disabled_issue.isEmpty()) {
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")
Expand Down
60 changes: 30 additions & 30 deletions rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
---
"Help":
- skip:
version: " - 7.99.99"
reason: "is_write_index is shown in cat.aliases starting version 8.0"
version: " - 7.3.99"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
cat.aliases:
Expand All @@ -20,15 +20,15 @@
$/

---
"Help (pre 8.0)":
"Help (pre 7.4.0)":
- skip:
version: "8.0.0 - "
version: "7.4.0 - "
features: node_selector
reason: "is_write_index is shown in cat.aliases starting version 8.0"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
node_selector:
version: " - 7.99.99"
version: " - 7.3.99"
cat.aliases:
help: true

Expand All @@ -55,8 +55,8 @@
---
"Simple alias":
- skip:
version: " - 7.99.99"
reason: "is_write_index is shown in cat.aliases starting version 8.0"
version: " - 7.3.99"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
indices.create:
Expand All @@ -82,11 +82,11 @@
$/

---
"Simple alias (pre 8.0)":
"Simple alias (pre 7.4.0)":
- skip:
version: "8.0.0 - "
version: "7.4.0 - "
features: node_selector
reason: "is_write_index is shown in cat.aliases starting version 8.0"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
indices.create:
Expand All @@ -99,7 +99,7 @@

- do:
node_selector:
version: " - 7.99.99"
version: " - 7.3.99"
cat.aliases: {}

- match:
Expand All @@ -115,8 +115,8 @@
---
"Complex alias":
- skip:
version: " - 7.99.99"
reason: "is_write_index is shown in cat.aliases starting version 8.0"
version: " - 7.3.99"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
indices.create:
Expand Down Expand Up @@ -153,11 +153,11 @@
$/

---
"Complex alias (pre 8.0)":
"Complex alias (pre 7.4.0)":
- skip:
version: "8.0.0 - "
version: "7.4.0 - "
features: node_selector
reason: "is_write_index is shown in cat.aliases starting version 8.0"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
indices.create:
Expand All @@ -180,7 +180,7 @@
foo: bar
- do:
node_selector:
version: " - 7.99.99"
version: " - 7.3.99"
cat.aliases: {}

- match:
Expand Down Expand Up @@ -279,8 +279,8 @@
---
"Column headers":
- skip:
version: " - 7.99.99"
reason: "is_write_index is shown in cat.aliases starting version 8.0"
version: " - 7.3.99"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
indices.create:
Expand Down Expand Up @@ -313,11 +313,11 @@
$/

---
"Column headers (pre 8.0)":
"Column headers (pre 7.4.0)":
- skip:
version: "8.0.0 - "
version: "7.4.0 - "
features: node_selector
reason: "is_write_index is shown in cat.aliases starting version 8.0"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
indices.create:
Expand All @@ -330,7 +330,7 @@

- do:
node_selector:
version: " - 7.99.99"
version: " - 7.3.99"
cat.aliases:
v: true

Expand Down Expand Up @@ -383,8 +383,8 @@
---
"Alias against closed index":
- skip:
version: " - 7.99.99"
reason: "is_write_index is shown in cat.aliases starting version 8.0"
version: " - 7.3.99"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
indices.create:
Expand Down Expand Up @@ -412,11 +412,11 @@
$/

---
"Alias against closed index (pre 8.0)":
"Alias against closed index (pre 7.4.0)":
- skip:
version: "8.0.0 - "
version: "7.4.0 - "
features: node_selector
reason: "is_write_index is shown in cat.aliases starting version 8.0"
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"

- do:
indices.create:
Expand All @@ -431,7 +431,7 @@

- do:
node_selector:
version: " - 7.99.99"
version: " - 7.3.99"
cat.aliases: {}

- match:
Expand Down