Convert modules to use yamlRestTest #59089
Merged
Conversation
This file contains 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
jakelandis
added
:Delivery/Build
|
Pinging @elastic/es-core-infra (:Core/Infra/Build) |
mark-vieira
reviewed
Jul 8, 2020
| @@ -17,6 +17,7 @@ | |||
| * under the License. | |||
| */ | |||
| apply plugin: 'elasticsearch.rest-resources' | |||
| apply plugin: 'elasticsearch.yaml-rest-test' | |||
There was a problem hiding this comment.
doesn't yaml-rest-test apply the rest-resources plugin?
There was a problem hiding this comment.
It does, wasn't sure if we wanted to keep it explicit since most projects are configured in some way or if we should just let it be implicit via the yaml-rest-test.
I don't have a strong opinion either way.
There was a problem hiding this comment.
I don't think we need to be explicit. We are saying this is a "yaml test project", we should assume that plugin will apply any dependencies.
| @@ -28,3 +29,5 @@ restResources { | |||
| includeCore '_common', 'indices', 'cluster', 'index', 'search', 'nodes' | |||
| } | |||
| } | |||
|
|
|||
| integTest.enabled = false | |||
There was a problem hiding this comment.
What's creating this task? Can we structure things somehow such that projects only with yaml tests simply don't have this task at all?
There was a problem hiding this comment.
It is the PluginBuildPlugin :( I can't really remove it or conditionally apply it until we get javaYamlTest (and all internalClusterTest are correctly moved too).
I should be able to get to that after all of the yamlRestTests are converted.
modules/geo/build.gradle
Outdated
| artifacts { | ||
| restTests(new File(projectDir, "src/test/resources/rest-api-spec/test")) | ||
| restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test")) |
There was a problem hiding this comment.
let's use file() instead of new File().
|
@elasticmachine update branch |
|
@elasticmachine update branch |
jakelandis
added a commit
to jakelandis/elasticsearch
that referenced
this pull request
Jul 13, 2020
This commit moves the modules REST tests to the newly introduced yamlRestTest source set. A few tests have also been re-named to include the correct IT suffix. Without changing the names, the testing conventions task would fail since now that the YAML tests are no longer present pacify the convention. These tests have moved to the internalClusterTest source set. related: elastic#56841
jakelandis
added a commit
to jakelandis/elasticsearch
that referenced
this pull request
Jul 13, 2020
This commit moves the modules REST tests to the newly introduced yamlRestTest source set. A few tests have also been re-named to include the correct IT suffix. Without changing the names, the testing conventions task would fail since now that the YAML tests are no longer present pacify the convention. These tests have moved to the internalClusterTest source set. related: elastic#56841
jakelandis
added a commit
that referenced
this pull request
Jul 13, 2020
This commit moves the modules REST tests to the newly introduced yamlRestTest source set. A few tests have also been re-named to include the correct IT suffix. Without changing the names, the testing conventions task would fail since now that the YAML tests are no longer present pacify the convention. These tests have moved to the internalClusterTest source set. related: #56841
jakelandis
added a commit
that referenced
this pull request
Jul 13, 2020
This commit moves the modules REST tests to the newly introduced yamlRestTest source set. A few tests have also been re-named to include the correct IT suffix. Without changing the names, the testing conventions task would fail since now that the YAML tests are no longer present pacify the convention. These tests have moved to the internalClusterTest source set. related: #56841
jakelandis
added a commit
that referenced
this pull request
Sep 8, 2020
This commit removes `integTest` task from all es-plugins. Most relevant projects have been converted to use yamlRestTest, javaRestTest, or internalClusterTest in prior PRs. A few projects needed to be adjusted to allow complete removal of this task * x-pack/plugin - converted to use yamlRestTest and javaRestTest * plugins/repository-hdfs - kept the integTest task, but use `rest-test` plugin to define the task * qa/die-with-dignity - convert to javaRestTest * x-pack/qa/security-example-spi-extension - convert to javaRestTest * multiple projects - remove the integTest.enabled = false (yay!) related: #61802 related: #60630 related: #59444 related: #59089 related: #56841 related: #59939 related: #55896
jakelandis
added a commit
to jakelandis/elasticsearch
that referenced
this pull request
Sep 8, 2020
This commit removes `integTest` task from all es-plugins. Most relevant projects have been converted to use yamlRestTest, javaRestTest, or internalClusterTest in prior PRs. A few projects needed to be adjusted to allow complete removal of this task * x-pack/plugin - converted to use yamlRestTest and javaRestTest * plugins/repository-hdfs - kept the integTest task, but use `rest-test` plugin to define the task * qa/die-with-dignity - convert to javaRestTest * x-pack/qa/security-example-spi-extension - convert to javaRestTest * multiple projects - remove the integTest.enabled = false (yay!) related: elastic#61802 related: elastic#60630 related: elastic#59444 related: elastic#59089 related: elastic#56841 related: elastic#59939 related: elastic#55896 # Conflicts: # qa/die-with-dignity/src/javaRestTest/java/org/elasticsearch/qa/die_with_dignity/DieWithDignityIT.java # x-pack/qa/security-example-spi-extension/build.gradle
jakelandis
added a commit
that referenced
this pull request
Sep 9, 2020
This commit removes `integTest` task from all es-plugins. Most relevant projects have been converted to use yamlRestTest, javaRestTest, or internalClusterTest in prior PRs. A few projects needed to be adjusted to allow complete removal of this task * x-pack/plugin - converted to use yamlRestTest and javaRestTest * plugins/repository-hdfs - kept the integTest task, but use `rest-test` plugin to define the task * qa/die-with-dignity - convert to javaRestTest * x-pack/qa/security-example-spi-extension - convert to javaRestTest * multiple projects - remove the integTest.enabled = false (yay!) related: #61802 related: #60630 related: #59444 related: #59089 related: #56841 related: #59939 related: #55896
mark-vieira
added
Team:Delivery
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 moves the modules REST tests to the
newly introduced yamlRestTest source set. A few
tests have also been re-named to include the correct
ITsuffix. Without changing the names, the testingconventions task would fail since now that the YAML
tests are no longer present pacify the convention.
These tests have moved to the internalClusterTest
source set.
related: #56841