Skip to content

Convert repository-* from integTest to [yaml | java]RestTest or internalClusterTest #60085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
jakelandis merged 6 commits into from
Jul 28, 2020
Merged

Convert repository-* from integTest to [yaml | java]RestTest or internalClusterTest #60085

jakelandis merged 6 commits into from
Jul 28, 2020

Conversation

@jakelandis
Copy link
Contributor

@jakelandis jakelandis commented Jul 22, 2020 •
edited
Loading

For OSS plugins that being with repository-*, integTest
task is now a no-op and all of the tests are now executed via a test,
yamlRestTest, javaRestTest, or internalClusterTest.

related: #56841
related: #59444

@jakelandis jakelandis marked this pull request as ready for review July 27, 2020 21:45
@jakelandis jakelandis added :Delivery/Build Build or test infrastructure v7.9.1 v8.0.0 labels Jul 27, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 27, 2020

Pinging @elastic/es-core-infra (:Core/Infra/Build)

@elasticmachine elasticmachine added the Team:Core/Infra Meta label for core/infra team label Jul 27, 2020
@jakelandis jakelandis added v7.10.0 and removed v7.9.1 labels Jul 27, 2020
mark-vieira
mark-vieira approved these changes Jul 27, 2020
View reviewed changes
Copy link
Contributor

@mark-vieira mark-vieira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. What's the final step for removing integTest altogether?

plugins/repository-gcs/build.gradle
task gcsThirdPartyTest(type: Test) {
dependsOn integTest,largeBlobIntegTest
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
Copy link
Contributor

@mark-vieira mark-vieira Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should think about building up some kind of convenience around this sort of thing.

Copy link
Member

@rjernst rjernst Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't the yaml-rest-test plugin doing this setup?

Copy link
Contributor

@mark-vieira mark-vieira Jul 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not that simple. By default the java plugin wires up all tasks of type Test with the test source set. What happens when we have a project with multiple test source sets, and then we manually create a Test task? Which source set should it default to?

Copy link
Member

@rjernst rjernst Jul 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah sorry, I misread this as the main yaml test, but i realize now this is another test task also utilizing the new source set. I agree then a helper or something to do this would be good, as it seems used several times in this PR.

Copy link
Contributor Author

@jakelandis jakelandis Jul 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed , I will take a look (in a future PR) for any way to simplify this boiler plate.

@jakelandis
Copy link
Contributor Author

jakelandis commented Jul 28, 2020

@mark-vieira - thanks for the review

What's the final step for removing integTest altogether?

I still have x-pack and some qa projects left. Once they are converted I should be able to remove it from all plugins.

@jakelandis
Copy link
Contributor Author

jakelandis commented Jul 28, 2020

@elasticmachine update branch

@jakelandis jakelandis merged commit c9315c3 into elastic:master Jul 28, 2020
@jakelandis jakelandis deleted the yamlRestTest_plugins_repo branch July 28, 2020 21:50
@jakelandis jakelandis mentioned this pull request Jul 29, 2020
Merged
jakelandis added a commit to jakelandis/elasticsearch that referenced this pull request Jul 29, 2020
@jakelandis
Convert repository-* from integTest to [yaml | java]RestTest or inter…
4ca91df 
…nalClusterTest (elastic#60085)

For OSS plugins that being with repository-*, integTest
task is now a no-op and all of the tests are now executed via a test,
yamlRestTest, javaRestTest, or internalClusterTest.

related: elastic#56841
related: elastic#59444
jakelandis added a commit that referenced this pull request Jul 29, 2020
@jakelandis
[7.x] Convert repository-* from integTest to [yaml | java]RestTest or…
96b7122 
… internalClusterTest (#60085) (#60404)

For OSS plugins that being with repository-*, integTest
task is now a no-op and all of the tests are now executed via a test,
yamlRestTest, javaRestTest, or internalClusterTest.

related: #56841
related: #59444
@mark-vieira mark-vieira added Team:Delivery Meta label for Delivery team and removed Team:Core/Infra Meta label for core/infra team labels Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mark-vieira mark-vieira mark-vieira approved these changes

@rjernst rjernst Awaiting requested review from rjernst

Assignees

No one assigned

Labels

:Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team v7.10.0 v8.0.0-alpha1

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jakelandis @elasticmachine @rjernst @mark-vieira