Skip to content
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.

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

Merge test runner task into RestIntegTest #60261

Merged

Conversation

breskeby
Copy link
Contributor

@breskeby breskeby commented Jul 28, 2020

  • Merging logic of runner tasks into RestIntegTest
  • Kept RestTestRunnerTask and renamed to StandaloneRestIntegTest for standalone usages of the runner task without configuration conventions applied.
  • Introducing RestTestBasePlugin to take care of configuration originally done in constructor of RestIntegTest
  • In a later separate PR we will revisit the usage of task avoidance api with RestIntegTest related tests as this requires more work as this is non trivial

@breskeby breskeby self-assigned this Jul 28, 2020
@breskeby breskeby added :Delivery/Build Build or test infrastructure Team:Core/Infra Meta label for core/infra team v7.10.0 v7.8.2 v7.9.1 v8.0.0 labels Jul 28, 2020
@breskeby breskeby force-pushed the task-avoidance-friendly-rest-integtests branch from 8ef064b to f41c2a5 Compare July 28, 2020 12:23
@breskeby breskeby force-pushed the task-avoidance-friendly-rest-integtests branch from f41c2a5 to db0eb83 Compare July 31, 2020 08:39
@breskeby breskeby marked this pull request as ready for review July 31, 2020 12:32
@elasticmachine
Copy link
Collaborator

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

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.

Looks great. Very glad to have all that junk removed from the task constructor and also no longer need the additional complexity of the "runner".

@@ -67,6 +67,8 @@ class StandaloneRestTestPlugin implements Plugin<Project> {
ElasticsearchJavaPlugin.configureInputNormalization(project)
ElasticsearchJavaPlugin.configureCompile(project)

project.pluginManager.apply(RestTestBasePlugin)
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: can we group this up above with the other plugin applications?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the original reason for this was that the plugin relies on nonInputSystemProperties.

I've redid the general augmentation of Test tasks now and moved that into its own plugin. Another benefit of this is we removed one reused static method from ElasticsearchJavaPlugin.

@breskeby breskeby self-assigned this Aug 3, 2020
@breskeby breskeby merged commit dd74be0 into elastic:master Aug 3, 2020
@breskeby breskeby deleted the task-avoidance-friendly-rest-integtests branch August 3, 2020 10:07
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Aug 3, 2020
* Merge test runner task into RestIntegTest
* Reorganizing Standalone runner and RestIntegTest task
* Rework general test task configuration and extension
@breskeby breskeby restored the task-avoidance-friendly-rest-integtests branch August 4, 2020 07:14
breskeby added a commit that referenced this pull request Aug 4, 2020
* Merge test runner task into RestIntegTest (#60261)
* Merge test runner task into RestIntegTest
* Reorganizing Standalone runner and RestIntegTest task
* Rework general test task configuration and extension
* Fix merge issues
* use former 7.x common test configuration
jakelandis added a commit that referenced this pull request Sep 18, 2020
This commit changes the yamlRestTest and javaRestTest tasks to be lazily created.
This change requires pro-actively creating the testClusters container so that the
configuration can be applied without any changes to the build.gradle files.

related: #60261
related: #47804
jakelandis added a commit to jakelandis/elasticsearch that referenced this pull request Sep 18, 2020
This commit changes the yamlRestTest and javaRestTest tasks to be lazily created.
This change requires pro-actively creating the testClusters container so that the
configuration can be applied without any changes to the build.gradle files.

related: elastic#60261
related: elastic#47804
jakelandis added a commit that referenced this pull request Sep 18, 2020
This commit changes the yamlRestTest and javaRestTest tasks to be lazily created.
This change requires pro-actively creating the testClusters container so that the
configuration can be applied without any changes to the build.gradle files.

related: #60261
related: #47804
@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
Labels
:Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team v7.10.0 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants