Add snapshot only test modules#61954
Merged
rjernst merged 6 commits intoelastic:masterfrom Sep 4, 2020
Merged
Conversation
This commit adds external test modules. These are modules meant for external systems to test edge cases in elasticsearch, but only within snapshots. They are not meant to be used in production, so protections are also added from their accidental inclusion in release builds. Note that this commit does not actually add any new modules, it only adds the infrastructure for the new modules, under `test/external-modules`.
Collaborator
|
Pinging @elastic/es-core-infra (:Core/Infra/Build) |
mark-vieira
approved these changes
Sep 4, 2020
Contributor
mark-vieira
left a comment
There was a problem hiding this comment.
Couple minor comments but LGTM.
| static void setupRunnerTask(Project project, RestIntegTestTask testTask, SourceSet sourceSet) { | ||
| testTask.setTestClassesDirs(sourceSet.getOutput().getClassesDirs()); | ||
| testTask.setClasspath(sourceSet.getRuntimeClasspath()); | ||
|
|
Contributor
There was a problem hiding this comment.
Why is this no longer needed?
Member
Author
There was a problem hiding this comment.
The test task depending on the module is handled within testclusters now. The plugin extension dependsOn is handled inside PluginBuildPlugin.
| dependsOn "${module.path}:bundlePlugin" | ||
| from({ zipTree(module.bundlePlugin.outputs.files.singleFile) }) { | ||
| dependsOn moduleConfig | ||
| from({ zipTree(moduleConfig.singleFile) }) { |
Contributor
There was a problem hiding this comment.
We should open an issue to use artifact transforms for this stuff as well so we don't have to keep doing this zipTree and singleFile nonsense. This is the same as the stuff @breskeby is working on to avoid a lot of unnecessary packing/unpacking in build processes.
| if (bundles.add(bundle) == false) { | ||
| throw new IllegalStateException("duplicate " + type + ": " + info); | ||
| } | ||
| if (type.equals("module") && info.getName().startsWith("test-") && Build.CURRENT.isSnapshot() == false) { |
Contributor
There was a problem hiding this comment.
Seems basing this on name is a little brittle. Is there no way to add arbitrary metadata to modules?
Member
Author
There was a problem hiding this comment.
There is not. We can add to the plugin properties, but I did not want to add an "official" property here, as it is really only about modules, yet the properties apply to all plugins and modules. I think the name checking is fine for now, since we completely own the namespace of modules.
Member
Author
|
@elasticmachine run elasticsearch-ci/2 |
rjernst
added a commit
that referenced
this pull request
Sep 4, 2020
This commit adds external test modules. These are modules meant for external systems to test edge cases in elasticsearch, but only within snapshots. They are not meant to be used in production, so protections are also added from their accidental inclusion in release builds. Note that this commit does not actually add any new modules, it only adds the infrastructure for the new modules, under `test/external-modules`.
jimczi
added a commit
to jimczi/elasticsearch
that referenced
this pull request
Sep 8, 2020
This change adds an aggregation that can be used to delay the
query phase execution on shards with a configurable time:
{
"aggs": {
"delay": {
"shard_delay": {
"value": "30s"
},
"aggs": {
"host": {
"terms": {
"field": "hostname"
}
}
}
}
}
}
This test module is built on top of elastic#61954 so the aggregation will be available only within
snapshots since this module is not meant to be used in production.
Closes elastic#54159
jimczi
added a commit
that referenced
this pull request
Sep 15, 2020
This change adds an aggregation that can be used to delay the
query phase execution on shards with a configurable time:
{
"aggs": {
"delay": {
"shard_delay": {
"value": "30s"
},
"aggs": {
"host": {
"terms": {
"field": "hostname"
}
}
}
}
}
}
This test module is built on top of #61954 so the aggregation will be available only within
snapshots since this module is not meant to be used in production.
Closes #54159
jimczi
added a commit
that referenced
this pull request
Sep 15, 2020
This change adds an aggregation that can be used to delay the
query phase execution on shards with a configurable time:
{
"aggs": {
"delay": {
"shard_delay": {
"value": "30s"
},
"aggs": {
"host": {
"terms": {
"field": "hostname"
}
}
}
}
}
}
This test module is built on top of #61954 so the aggregation will be available only within
snapshots since this module is not meant to be used in production.
Closes #54159
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit adds external test modules. These are modules meant for
external systems to test edge cases in elasticsearch, but only within
snapshots. They are not meant to be used in production, so protections
are also added from their accidental inclusion in release builds.
Note that this commit does not actually add any new modules, it only
adds the infrastructure for the new modules, under
test/external-modules.