Convert most OSS plugins from integTest to [yaml | java]RestTest or internalClusterTest #59444

jakelandis · 2020-07-13T17:13:57Z

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

This commit does NOT convert the discovery-* and repository-* since they
are bit more complex then the rest of tests and this PR is large enough.
Those plugins will be addressed in a future PR(s).

This commit also fixes a minor issue that did not copy the rest api
for projects that only had YAML TEST tests.

related: #56841

elasticmachine · 2020-07-13T17:13:59Z

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

jakelandis · 2020-07-13T17:14:39Z

plugins/analysis-icu/build.gradle

-    "com.ibm.icu.text.Collator#getInstance() @ Don't use default locale, use getInstance(ULocale) instead"
-  ]
+tasks.withType(CheckForbiddenApis).configureEach { task ->
+  if(task.name.contains("YamlRestTest") == false) {


this is needed since the yamlRestRest does not have access to that class

Maybe this should be explicit, applying the signature to forbiddanApisMain and forbiddenApisTest, rather than all CheckForbiddenApis tasks? We are likely to continue adding more source sets in the future, so having configuration apply to all source sets would be problematic.

👍 done 5c75412 (#59444) for the main source set (probably not the extra config noise for the test and internalTestCluster source sets)

rjernst

I just have a few comments

rjernst · 2020-07-14T16:14:22Z

plugins/analysis-icu/build.gradle

-    "com.ibm.icu.text.Collator#getInstance() @ Don't use default locale, use getInstance(ULocale) instead"
-  ]
+tasks.withType(CheckForbiddenApis).configureEach { task ->
+  if(task.name.contains("YamlRestTest") == false) {


Maybe this should be explicit, applying the signature to forbiddanApisMain and forbiddenApisTest, rather than all CheckForbiddenApis tasks? We are likely to continue adding more source sets in the future, so having configuration apply to all source sets would be problematic.

rjernst · 2020-07-14T16:14:46Z

plugins/analysis-kuromoji/build.gradle

@@ -33,6 +33,8 @@ restResources {
  }
 }

+integTest.enabled = false


Why is this being disabled?

We need a plan for ripping the creation of the integTest task out from the PluginBuildPlugin. Otherwise this is going to be necessary for any plugin project that uses only yaml tests. Or tweak our test conventions logic so it doesn't complain about this scenario.

I found a need to implement a javaRestTest as part of converting these plugins, so (without hacks) can't finish my conversion to yamlRestTest .. Between javaRestTest, yamlRestTest, and internalClusterTest there is no need for integTest to exist anymore. I plan to rip out integTest once all of these are implemented. It won't take long (but my attention is split among a few things at the moment).

rjernst · 2020-07-14T16:15:28Z

plugins/analysis-nori/build.gradle

@@ -32,6 +32,9 @@ restResources {
    includeCore '_common', 'indices', 'index', 'search'
  }
 }
+
+integTest.enabled = false


Ditto. If we need to disable a test, can we have a comment explaining why it is disabled? Someone coming along in the future will have no reason whether this can/should be re-enabled.

This isn't really disabling a test ... it is to avoid the testing conventions from complaining. I would prefer to tweak the testing conventions instead of a lot of redunant comments. I can do that in a separate PR (and remove these in this PR)

jakelandis · 2020-07-21T14:33:39Z

@rjernst @mark-vieira - #59939 has been submitted that introduces the javaRestTest plugin and converts the modules over. That PR also conditionally disables the integTest task so once that gets merged, and I bring those changes to this PR, i will update this PR to remove usages of integTest too.

Introduce a javaRestTest source set and task to compliment the yamlRestTest. javaRestTest differs such that the code is sourced from Java and may have different dependencies and setup requirements for the test clusters. This also allows the tests to run in parallel in different cluster instances to prevent any cross test contamination between the two types of tests. Included in this PR is all :modules no longer use the integTest task. The tests are now driven by test, yamlRestTest, javaRestTest, and internalClusterTest. Since only :modules (and :rest-api-spec) have been converted to yamlRestTest we can now disable the integTest task if either yamlRestTest or javaRestTest have been applied. Once all projects are converted, we can delete the integTest task. related: #56841 related: #59444

…9939) Introduce a javaRestTest source set and task to compliment the yamlRestTest. javaRestTest differs such that the code is sourced from Java and may have different dependencies and setup requirements for the test clusters. This also allows the tests to run in parallel in different cluster instances to prevent any cross test contamination between the two types of tests. Included in this PR is all :modules no longer use the integTest task. The tests are now driven by test, yamlRestTest, javaRestTest, and internalClusterTest. Since only :modules (and :rest-api-spec) have been converted to yamlRestTest we can now disable the integTest task if either yamlRestTest or javaRestTest have been applied. Once all projects are converted, we can delete the integTest task. related: elastic#56841 related: elastic#59444

jakelandis · 2020-07-21T23:14:55Z

hold off on reviewing... now that #59939 has been merged and integrated here, there is still some more work on this PR.

jakelandis · 2020-07-27T21:51:50Z

@elasticmachine update branch

elasticmachine · 2020-07-27T21:51:52Z

merge conflict between base and head

) (#60026) Introduce a javaRestTest source set and task to compliment the yamlRestTest. javaRestTest differs such that the code is sourced from Java and may have different dependencies and setup requirements for the test clusters. This also allows the tests to run in parallel in different cluster instances to prevent any cross test contamination between the two types of tests. Included in this PR is all :modules no longer use the integTest task. The tests are now driven by test, yamlRestTest, javaRestTest, and internalClusterTest. Since only :modules (and :rest-api-spec) have been converted to yamlRestTest we can now disable the integTest task if either yamlRestTest or javaRestTest have been applied. Once all projects are converted, we can delete the integTest task. related: #56841 related: #59444

…nternalClusterTest (elastic#59444) For all OSS plugins (except repository-* and discovery-*) integTest task is now a no-op and all of the tests are now executed via a test, yamlRestTest, javaRestTest, or internalClusterTest. This commit does NOT convert the discovery-* and repository-* since they are bit more complex then the rest of tests and this PR is large enough. Those plugins will be addressed in a future PR(s). This commit also fixes a minor issue that did not copy the rest api for projects that only had YAML TEST tests. related: elastic#56841 # Conflicts: # plugins/examples/painless-whitelist/build.gradle # plugins/examples/security-authorization-engine/build.gradle

…alClusterTest (#60084) For OSS plugins that begin with discovery-*, the 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

…alClusterTest (elastic#60084) For OSS plugins that begin with discovery-*, the 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

…nalClusterTest (#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: #56841 related: #59444

…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

… 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

…internalClusterTest (#60084) (#60344) For OSS plugins that begin with discovery-*, the 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

…t or internalClusterTest (#59444) (#60343) For all OSS plugins (except repository-* and discovery-*) integTest task is now a no-op and all of the tests are now executed via a test, yamlRestTest, javaRestTest, or internalClusterTest. This commit does NOT convert the discovery-* and repository-* since they are bit more complex then the rest of tests and this PR is large enough. Those plugins will be addressed in a future PR(s). This commit also fixes a minor issue that did not copy the rest api for projects that only had YAML TEST tests. related: #56841

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

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

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 6 commits July 11, 2020 16:15

start of migration

376db42

fix annoyning bug

1e56bb3

more conversion, ignore repository and store for now

424fd5e

Merge remote-tracking branch 'upstream/master' into yamlRestTest_plugins

5fd84d2

remove temporary code

aa96ed8

remove unecessary todo

dfebc85

jakelandis added :Delivery/Build Build or test infrastructure v8.0.0 v7.9.0 v7.8.2 labels Jul 13, 2020

jakelandis requested a review from mark-vieira July 13, 2020 17:13

elasticmachine added the Team:Core/Infra Meta label for core/infra team label Jul 13, 2020

jakelandis commented Jul 13, 2020

View reviewed changes

jakelandis added 2 commits July 13, 2020 12:15

remove unecessary todo

2be2c71

remove rouge plugin defintion

c603b80

rjernst reviewed Jul 14, 2020

View reviewed changes

jakelandis mentioned this pull request Jul 21, 2020

Introduce javaRestTest source set/task and convert modules #59939

Merged

jakelandis added 2 commits July 21, 2020 17:38

Merge branch 'master' into yamlRestTest_plugins

bbc08f9

remove (now) unneccessary integTest.enabled=false

a9a34d9

jakelandis marked this pull request as draft July 21, 2020 23:03

fix forbiden API and move test

5c75412

jakelandis added 4 commits July 22, 2020 10:30

more migration

2fab21b

finish examples

cc09550

more

cd76cf4

repository-azure

4a2d639

Merge branch 'master' into yamlRestTest_plugins

7b07432

jakelandis added v7.10.0 and removed v7.9.0 labels Jul 27, 2020

Merge remote-tracking branch 'upstream/master' into yamlRestTest_plugins

8058400

Merge remote-tracking branch 'upstream/master' into yamlRestTest_plugins

1832e79

jakelandis merged commit 10be5d4 into elastic:master Jul 28, 2020

jakelandis deleted the yamlRestTest_plugins branch July 28, 2020 21:43

jakelandis added the backport pending label Jul 28, 2020

jakelandis mentioned this pull request Jul 28, 2020

[7.x] Convert most OSS plugins from integTest to [yaml | java]RestTest or internalClusterTest (#59444) #60343

Merged

jakelandis removed the backport pending label Jul 29, 2020

jakelandis mentioned this pull request Sep 2, 2020

Remove integTest task from PluginBuildPlugin #61879

Merged

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

jakelandis added v8.0.0-alpha1 and removed v8.0.0 labels Jul 26, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert most OSS plugins from integTest to [yaml | java]RestTest or internalClusterTest #59444

Convert most OSS plugins from integTest to [yaml | java]RestTest or internalClusterTest #59444

jakelandis commented Jul 13, 2020 •

edited

Loading

elasticmachine commented Jul 13, 2020

jakelandis Jul 13, 2020

rjernst Jul 14, 2020

jakelandis Jul 21, 2020

rjernst left a comment

rjernst Jul 14, 2020

rjernst Jul 14, 2020

mark-vieira Jul 14, 2020

jakelandis Jul 14, 2020

rjernst Jul 14, 2020

jakelandis Jul 14, 2020

jakelandis commented Jul 21, 2020

jakelandis commented Jul 21, 2020

jakelandis commented Jul 27, 2020

elasticmachine commented Jul 27, 2020

Convert most OSS plugins from integTest to [yaml | java]RestTest or internalClusterTest #59444

Convert most OSS plugins from integTest to [yaml | java]RestTest or internalClusterTest #59444

Conversation

jakelandis commented Jul 13, 2020 • edited Loading

elasticmachine commented Jul 13, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rjernst left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jakelandis commented Jul 21, 2020

jakelandis commented Jul 21, 2020

jakelandis commented Jul 27, 2020

elasticmachine commented Jul 27, 2020

jakelandis commented Jul 13, 2020 •

edited

Loading