Skip to content

Commit 47db1d6

Browse files
committed
Reindex: Fold "with all deps" project into reindex (#30154)
This folds the `:qa:smoke-test-reindex-with-all-modules` project into `:modules:reindex` by declaring the reindex's integration testing cluster requires the `parent-join` and `lang-painless` plugins and then moving all of the integration tests that depended on parent-join and painless into reindex. It saves us one cluster start up during the build at the cost of a little of the reindex module's "purity". Since the reindex module *does* have unit tests that test scripting without painless I'm fairly ok with that.
1 parent a6233b9 commit 47db1d6

File tree

12 files changed

+55
-173
lines changed

12 files changed

+55
-173
lines changed

modules/reindex/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,17 @@ esplugin {
3030
}
3131

3232
integTestCluster {
33+
// Modules who's integration is explicitly tested in integration tests
34+
module project(':modules:parent-join')
35+
module project(':modules:lang-painless')
3336
// Whitelist reindexing from the local node so we can test reindex-from-remote.
3437
setting 'reindex.remote.whitelist', '127.0.0.1:*'
3538
}
3639

3740
run {
41+
// Modules who's integration is explicitly tested in integration tests
42+
module project(':modules:parent-join')
43+
module project(':modules:lang-painless')
3844
// Whitelist reindexing from the local node so we can test reindex-from-remote.
3945
setting 'reindex.remote.whitelist', '127.0.0.1:*'
4046
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"Response format search failures":
2+
"Response format for search failures":
33
- do:
44
index:
55
index: source
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,3 +433,28 @@
433433
- match: { docs.2._index: index2 }
434434
- match: { docs.2._type: type2 }
435435
- match: { docs.2._id: fr_789 }
436+
437+
---
438+
"Totally broken scripts report the error properly":
439+
- do:
440+
index:
441+
index: twitter
442+
type: tweet
443+
id: 1
444+
body: { "user": "kimchy" }
445+
- do:
446+
indices.refresh: {}
447+
448+
- do:
449+
catch: request
450+
reindex:
451+
refresh: true
452+
body:
453+
source:
454+
index: twitter
455+
dest:
456+
index: new_twitter
457+
script:
458+
lang: painless
459+
source: syntax errors are fun!
460+
- match: {error.reason: 'compile error'}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
"Response format search failures":
2+
"Response format for search failures":
33
- do:
44
index:
55
index: source
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,3 +421,25 @@
421421
term:
422422
level: 11
423423
- match: { hits.total: 0 }
424+
425+
---
426+
"Totally broken scripts report the error properly":
427+
- do:
428+
index:
429+
index: twitter
430+
type: tweet
431+
id: 1
432+
body: { "user": "kimchy" }
433+
- do:
434+
indices.refresh: {}
435+
436+
- do:
437+
catch: request
438+
update_by_query:
439+
index: twitter
440+
refresh: true
441+
body:
442+
script:
443+
lang: painless
444+
source: syntax errors are fun!
445+
- match: {error.reason: 'compile error'}

qa/smoke-test-reindex-with-all-modules/build.gradle

Lines changed: 0 additions & 26 deletions
This file was deleted.

qa/smoke-test-reindex-with-all-modules/src/test/java/org/elasticsearch/smoketest/SmokeTestReindexWithPainlessClientYamlTestSuiteIT.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/20_broken.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/30_timeout.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)