Skip to content

Commit 3cf174d

Browse files
authored
re-enable bwc tests and update cat.alias rest tests (elastic#45822)
* correct version bounds to 7.4 for cat.alias rest tests * re-enable bwc tests
1 parent 0fb695e commit 3cf174d

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ task verifyVersions {
176176
* after the backport of the backcompat code is complete.
177177
*/
178178

179-
boolean bwc_tests_enabled = false
180-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/45798" /* place a PR link here when committing bwc changes */
179+
boolean bwc_tests_enabled = true
180+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
181181
if (bwc_tests_enabled == false) {
182182
if (bwc_tests_disabled_issue.isEmpty()) {
183183
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
---
33
"Help":
44
- skip:
5-
version: " - 7.99.99"
6-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
5+
version: " - 7.3.99"
6+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
77

88
- do:
99
cat.aliases:
@@ -20,15 +20,15 @@
2020
$/
2121
2222
---
23-
"Help (pre 8.0)":
23+
"Help (pre 7.4.0)":
2424
- skip:
25-
version: "8.0.0 - "
25+
version: "7.4.0 - "
2626
features: node_selector
27-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
27+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
2828

2929
- do:
3030
node_selector:
31-
version: " - 7.99.99"
31+
version: " - 7.3.99"
3232
cat.aliases:
3333
help: true
3434

@@ -55,8 +55,8 @@
5555
---
5656
"Simple alias":
5757
- skip:
58-
version: " - 7.99.99"
59-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
58+
version: " - 7.3.99"
59+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
6060

6161
- do:
6262
indices.create:
@@ -82,11 +82,11 @@
8282
$/
8383
8484
---
85-
"Simple alias (pre 8.0)":
85+
"Simple alias (pre 7.4.0)":
8686
- skip:
87-
version: "8.0.0 - "
87+
version: "7.4.0 - "
8888
features: node_selector
89-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
89+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
9090

9191
- do:
9292
indices.create:
@@ -99,7 +99,7 @@
9999

100100
- do:
101101
node_selector:
102-
version: " - 7.99.99"
102+
version: " - 7.3.99"
103103
cat.aliases: {}
104104

105105
- match:
@@ -115,8 +115,8 @@
115115
---
116116
"Complex alias":
117117
- skip:
118-
version: " - 7.99.99"
119-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
118+
version: " - 7.3.99"
119+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
120120

121121
- do:
122122
indices.create:
@@ -153,11 +153,11 @@
153153
$/
154154
155155
---
156-
"Complex alias (pre 8.0)":
156+
"Complex alias (pre 7.4.0)":
157157
- skip:
158-
version: "8.0.0 - "
158+
version: "7.4.0 - "
159159
features: node_selector
160-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
160+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
161161

162162
- do:
163163
indices.create:
@@ -180,7 +180,7 @@
180180
foo: bar
181181
- do:
182182
node_selector:
183-
version: " - 7.99.99"
183+
version: " - 7.3.99"
184184
cat.aliases: {}
185185

186186
- match:
@@ -279,8 +279,8 @@
279279
---
280280
"Column headers":
281281
- skip:
282-
version: " - 7.99.99"
283-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
282+
version: " - 7.3.99"
283+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
284284

285285
- do:
286286
indices.create:
@@ -313,11 +313,11 @@
313313
$/
314314
315315
---
316-
"Column headers (pre 8.0)":
316+
"Column headers (pre 7.4.0)":
317317
- skip:
318-
version: "8.0.0 - "
318+
version: "7.4.0 - "
319319
features: node_selector
320-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
320+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
321321

322322
- do:
323323
indices.create:
@@ -330,7 +330,7 @@
330330

331331
- do:
332332
node_selector:
333-
version: " - 7.99.99"
333+
version: " - 7.3.99"
334334
cat.aliases:
335335
v: true
336336

@@ -383,8 +383,8 @@
383383
---
384384
"Alias against closed index":
385385
- skip:
386-
version: " - 7.99.99"
387-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
386+
version: " - 7.3.99"
387+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
388388

389389
- do:
390390
indices.create:
@@ -412,11 +412,11 @@
412412
$/
413413
414414
---
415-
"Alias against closed index (pre 8.0)":
415+
"Alias against closed index (pre 7.4.0)":
416416
- skip:
417-
version: "8.0.0 - "
417+
version: "7.4.0 - "
418418
features: node_selector
419-
reason: "is_write_index is shown in cat.aliases starting version 8.0"
419+
reason: "is_write_index is shown in cat.aliases starting version 7.4.0"
420420

421421
- do:
422422
indices.create:
@@ -431,7 +431,7 @@
431431

432432
- do:
433433
node_selector:
434-
version: " - 7.99.99"
434+
version: " - 7.3.99"
435435
cat.aliases: {}
436436

437437
- match:

0 commit comments

Comments
 (0)