Treat all xpack as modules #64832
Merged
Treat all xpack as modules #64832
+19
−22
Conversation
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
When rest tests install plugins, they currently treat xpack as plugins instead of modules. This was a side effect of splitting the rest test plugin out from PluginBuildPlugin. However, that means xpack modules are being run through the elasticsearch plugin installer, which is not guaranteed to work. This commit reworks rest tests to treat anything under xpack as a module. A side effect of this is that QA plugins under xpack get treated as modules. This is ok because they are just for testing, we don't need to validate them in the same way we do actual plugins. Additionally, this commit relaxes the expection that modules are only added for the integ test distribution. There is already a check to not overwrite an existing module, so this wasn't a useful optimization anyways.
rjernst
added
:Delivery/Build
Collaborator
|
Pinging @elastic/es-core-infra (:Core/Infra/Build) |
mark-vieira
approved these changes
Nov 9, 2020
Contributor
mark-vieira
left a comment
mark-vieira
left a comment
There was a problem hiding this comment.
One comment for some bonus cleanup but otherwise LGTM.
| if (project.getPath().contains("modules:") || project.getPath().startsWith(":x-pack:plugin")) { | ||
| testTask.getClusters().forEach(c -> c.module(bundle.getArchiveFile())); | ||
| } else { | ||
| testTask.getClusters().forEach(c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))); |
Contributor
There was a problem hiding this comment.
Can we simplify this nested provider while we're here?
rjernst
added a commit
that referenced
this pull request
Nov 10, 2020
When rest tests install plugins, they currently treat xpack as plugins instead of modules. This was a side effect of splitting the rest test plugin out from PluginBuildPlugin. However, that means xpack modules are being run through the elasticsearch plugin installer, which is not guaranteed to work. This commit reworks rest tests to treat anything under xpack as a module. A side effect of this is that QA plugins under xpack get treated as modules. This is ok because they are just for testing, we don't need to validate them in the same way we do actual plugins. Additionally, this commit relaxes the expection that modules are only added for the integ test distribution. There is already a check to not overwrite an existing module, so this wasn't a useful optimization anyways.
mark-vieira
added
Team:Delivery
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.
When rest tests install plugins, they currently treat xpack as plugins
instead of modules. This was a side effect of splitting the rest test
plugin out from PluginBuildPlugin. However, that means xpack modules are
being run through the elasticsearch plugin installer, which is not
guaranteed to work. This commit reworks rest tests to treat anything
under xpack as a module. A side effect of this is that QA plugins under
xpack get treated as modules. This is ok because they are just for
testing, we don't need to validate them in the same way we do actual
plugins. Additionally, this commit relaxes the expection that modules
are only added for the integ test distribution. There is already a check
to not overwrite an existing module, so this wasn't a useful
optimization anyways.