[7.x] Remove integTest task from PluginBuildPlugin (#61879)

buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy

@@ -25,7 +25,6 @@ import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin
 import org.elasticsearch.gradle.info.BuildParams
-import org.elasticsearch.gradle.test.RestIntegTestTask
 import org.elasticsearch.gradle.test.RestTestBasePlugin
 import org.elasticsearch.gradle.testclusters.RunTask
 import org.elasticsearch.gradle.util.Util
@@ -62,16 +61,7 @@ class PluginBuildPlugin implements Plugin<Project> {
         boolean isXPackModule = project.path.startsWith(':x-pack:plugin')
         boolean isModule = project.path.startsWith(':modules:') || isXPackModule
 
-        createIntegTestTask(project)
         createBundleTasks(project, extension)
-        project.tasks.named("integTest").configure {
-            it.dependsOn(project.tasks.named("bundlePlugin"))
-        }
-        if (isModule) {
-            project.testClusters.integTest.module(project.tasks.bundlePlugin.archiveFile)
-        } else {
-            project.testClusters.integTest.plugin(project.tasks.bundlePlugin.archiveFile)
-        }
 
         project.afterEvaluate {
             project.extensions.getByType(PluginPropertiesExtension).extendedPlugins.each { pluginName ->
@@ -118,14 +108,6 @@ class PluginBuildPlugin implements Plugin<Project> {
             }
         }
 
-        //disable integTest task if project has been converted to use yaml or java rest test plugin
-        project.pluginManager.withPlugin("elasticsearch.yaml-rest-test") {
-            project.tasks.integTest.enabled = false
-        }
-        project.pluginManager.withPlugin("elasticsearch.java-rest-test") {
-            project.tasks.integTest.enabled = false
-        }
-
         project.tasks.named('testingConventions').configure {
             naming.clear()
             naming {
@@ -144,7 +126,6 @@ class PluginBuildPlugin implements Plugin<Project> {
         // allow running ES with this plugin in the foreground of a build
         project.tasks.register('run', RunTask) {
             dependsOn(project.tasks.bundlePlugin)
-            useCluster project.testClusters.integTest
         }
     }
 
@@ -187,13 +168,6 @@ class PluginBuildPlugin implements Plugin<Project> {
         }
     }
 
-    /** Adds an integTest task which runs rest tests */
-    private static void createIntegTestTask(Project project) {
-        RestIntegTestTask integTest = project.tasks.create('integTest', RestIntegTestTask.class)
-        integTest.mustRunAfter('precommit', 'test')
-        project.check.dependsOn(integTest)
-    }
-
     /**
      * Adds a bundlePlugin task which builds the zip containing the plugin jars,
      * metadata, properties, and packaging files

buildSrc/src/test/java/org/elasticsearch/gradle/plugin/PluginBuildPluginTests.java

@@ -50,7 +50,7 @@ public void testApply() {
         );
         assertNotNull("plugin extensions has the right type", project.getExtensions().findByType(PluginPropertiesExtension.class));
 
-        assertNotNull("plugin created an integTest class", project.getTasks().findByName("integTest"));
+        assertNull("plugin should not create the integTest task", project.getTasks().findByName("integTest"));
     }
 
     @Ignore("https://github.com/elastic/elasticsearch/issues/47123")

client/client-benchmark-noop-api-plugin/build.gradle

@@ -35,4 +35,3 @@ dependenciesInfo.enabled = false
 
 // no unit tests
 test.enabled = false
-integTest.enabled = false

distribution/build.gradle

@@ -253,10 +253,6 @@ project.rootProject.subprojects.findAll { it.parent.path == ':modules' }.each {
   copyLog4jProperties(buildOssLog4jConfig, module)
   copyLog4jProperties(buildDefaultLog4jConfig, module)
 
-  // make sure the module's integration tests run after the integ-test-zip (ie rest tests)
-  module.afterEvaluate({
-    module.integTest.mustRunAfter(':distribution:archives:integ-test-zip:integTest')
-  })
   restTestExpansions['expected.modules.count'] += 1
 }
 

modules/lang-expression/build.gradle

@@ -37,8 +37,6 @@ restResources {
   }
 }
 
-integTest.enabled = false
-
 tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
   mapping from: /asm-.*/, to: 'asm'

modules/lang-painless/build.gradle

@@ -54,8 +54,6 @@ restResources {
   }
 }
 
-integTest.enabled = false
-
 tasks.named("test").configure {
   // in WhenThingsGoWrongTests we intentionally generate an out of memory error, this prevents the heap from being dumped to disk
   jvmArgs '-XX:-OmitStackTraceInFastThrow', '-XX:-HeapDumpOnOutOfMemoryError'

modules/systemd/build.gradle

@@ -22,4 +22,3 @@ esplugin {
   classname 'org.elasticsearch.systemd.SystemdPlugin'
 }
 
-integTest.enabled = false

plugins/repository-hdfs/build.gradle

@@ -29,6 +29,7 @@ import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE
 
 apply plugin: 'elasticsearch.test.fixtures'
 apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.rest-test'
 
 esplugin {
   description 'The HDFS repository plugin adds support for Hadoop Distributed File-System (HDFS) repositories.'
@@ -94,6 +95,14 @@ tasks.named("dependencyLicenses").configure {
   mapping from: /hadoop-.*/, to: 'hadoop'
 }
 
+tasks.named("integTest").configure {
+  it.dependsOn(project.tasks.named("bundlePlugin"))
+}
+
+testClusters.integTest {
+  plugin(project.tasks.bundlePlugin.archiveFile)
+}
+
 String realm = "BUILD.ELASTIC.CO"
 String krb5conf = project(':test:fixtures:krb5kdc-fixture').ext.krb5Conf("hdfs")
 

plugins/transport-nio/build.gradle

@@ -27,8 +27,6 @@ esplugin {
   hasClientJar = true
 }
 
-// integTest have been converted to internalClusterTest 
-integTest.enabled = false
 dependencies {
   api project(':libs:elasticsearch-nio')
 

qa/die-with-dignity/build.gradle

@@ -1,43 +1,28 @@
 import org.elasticsearch.gradle.info.BuildParams
 
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-apply plugin: 'elasticsearch.testclusters'
+apply plugin: 'elasticsearch.java-rest-test'
 apply plugin: 'elasticsearch.esplugin'
 
 esplugin {
   description 'Die with dignity plugin'
   classname 'org.elasticsearch.DieWithDignityPlugin'
 }
 
-integTest {
+dependencies {
+  // let the javaRestTest see the classpath of main
+  javaRestTestImplementation project.sourceSets.main.runtimeClasspath
+}
+
+javaRestTest {
   systemProperty 'tests.security.manager', 'false'
   systemProperty 'tests.system_call_filter', 'false'
-  nonInputProperties.systemProperty 'log', "${-> testClusters.integTest.singleNode().getServerLog()}"
+  nonInputProperties.systemProperty 'log', "${-> testClusters.javaRestTest.singleNode().getServerLog()}"
   systemProperty 'runtime.java.home', BuildParams.runtimeJavaHome
 }
 
-testClusters.integTest {
+testClusters.javaRestTest {
   systemProperty "die.with.dignity.test", "whatever"
 }
 
 test.enabled = false
 
-check.dependsOn integTest

qa/die-with-dignity/src/test/java/org/elasticsearch/qa/die_with_dignity/DieWithDignityIT.java → qa/die-with-dignity/src/javaRestTest/java/org/elasticsearch/qa/die_with_dignity/DieWithDignityIT.java

@@ -7,7 +7,7 @@
  * not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -67,9 +67,9 @@ public void testDieWithDignity() throws Exception {
         try {
             while (it.hasNext() && (fatalError == false || fatalErrorInThreadExiting == false)) {
                 final String line = it.next();
-                if (line.matches(".*ERROR.*o\\.e\\.ExceptionsHelper.*integTest-0.*fatal error.*")) {
+                if (line.matches(".*ERROR.*o\\.e\\.ExceptionsHelper.*javaRestTest-0.*fatal error.*")) {
                     fatalError = true;
-                } else if (line.matches(".*ERROR.*o\\.e\\.b\\.ElasticsearchUncaughtExceptionHandler.*integTest-0.*"
+                } else if (line.matches(".*ERROR.*o\\.e\\.b\\.ElasticsearchUncaughtExceptionHandler.*javaRestTest-0.*"
                     + "fatal error in thread \\[Thread-\\d+\\], exiting.*")) {
                     fatalErrorInThreadExiting = true;
                     assertTrue(it.hasNext());
@@ -87,6 +87,15 @@ public void testDieWithDignity() throws Exception {
         }
     }
 
+    private boolean containsAll(String line, String... subStrings) {
+        for (String subString : subStrings) {
+            if (line.matches(subString) == false) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     private void debugLogs(Path path) throws IOException {
         try (BufferedReader reader = Files.newBufferedReader(path)) {
             reader.lines().forEach(line -> logger.info(line));

x-pack/plugin/analytics/build.gradle

@@ -20,4 +20,3 @@ dependencies {
   api 'org.apache.commons:commons-math3:3.2'
 }
 
-integTest.enabled = false

x-pack/plugin/async-search/build.gradle

@@ -29,5 +29,4 @@ dependencies {
   testImplementation project(path: xpackModule('async'))
 }
 
-integTest.enabled = false
 

x-pack/plugin/async/build.gradle

@@ -21,5 +21,5 @@ dependencyLicenses {
 tasks.named("test").configure {
   enabled = false
 }
-integTest.enabled = false
+
 

x-pack/plugin/autoscaling/build.gradle

@@ -12,8 +12,6 @@ esplugin {
 }
 archivesBaseName = 'x-pack-autoscaling'
 
-integTest.enabled = false
-
 tasks.named('internalClusterTest').configure {
   if (BuildParams.isSnapshotBuild() == false) {
     systemProperty 'es.autoscaling_feature_flag_registered', 'true'

x-pack/plugin/build.gradle

@@ -5,17 +5,16 @@ import org.gradle.internal.jvm.Jvm
 
 import java.nio.charset.StandardCharsets
 
-apply plugin: 'elasticsearch.testclusters'
-apply plugin: 'elasticsearch.standalone-rest-test'
-apply plugin: 'elasticsearch.rest-test'
-apply plugin: 'elasticsearch.rest-resources'
+apply plugin: 'elasticsearch.java-rest-test'
+apply plugin: 'elasticsearch.yaml-rest-test'
 apply plugin: 'elasticsearch.validate-rest-spec'
 
 archivesBaseName = 'x-pack'
 
 dependencies {
-  testImplementation project(xpackModule('core')) // this redundant dependency is here to make IntelliJ happy
-  testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
+  yamlRestTestImplementation project(xpackModule('core')) // this redundant dependency is here to make IntelliJ happy
+  yamlRestTestImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
+  javaRestTestImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
 }
 
 subprojects {
@@ -62,22 +61,32 @@ subprojects {
 configurations {
   testArtifacts.extendsFrom testRuntime
   testArtifacts.extendsFrom testImplementation
+  testArtifacts.extendsFrom yamlRestTestImplementation
+  testArtifacts.extendsFrom javaRestTestImplementation
 }
 
 restResources {
   restApi {
     includeCore '*'
+    includeXpack '*'
+  }
+  restTests {
+    includeXpack '*'
   }
 }
 
+//The api and tests need to stay at src/test/... since some external tooling depends on that exact file path.
 artifacts {
   restXpackSpecs(new File(projectDir, "src/test/resources/rest-api-spec/api"))
   restXpackTests(new File(projectDir, "src/test/resources/rest-api-spec/test"))
 }
 
 def testJar = tasks.register("testJar", Jar) {
   appendix 'test'
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
   from sourceSets.test.output
+  from sourceSets.yamlRestTest.output
+  from sourceSets.javaRestTest.output
   /*
    * Stick the license and notice file in the jar. This isn't strictly
    * needed because we don't publish it but it makes our super-paranoid
@@ -114,10 +123,10 @@ tasks.register("copyKeyCerts", Copy) {
   into keystoreDir
 }
 // Add keystores to test classpath: it expects it there
-sourceSets.test.resources.srcDir(keystoreDir)
-processTestResources.dependsOn("copyKeyCerts")
+sourceSets.yamlRestTest.resources.srcDir(keystoreDir)
+processYamlRestTestResources.dependsOn("copyKeyCerts")
 
-integTest {
+yamlRestTest {
   /*
    * We have to disable setting the number of available processors as tests in the same JVM randomize processors and will step on each
    * other if we allow them to set the number of available processors as it's set-once in Netty.
@@ -137,7 +146,7 @@ integTest {
   dependsOn copyKeyCerts
 }
 
-testClusters.integTest {
+testClusters.all {
   testDistribution = 'DEFAULT' // this is important since we use the reindex module in ML
   setting 'xpack.ml.enabled', 'true'
   setting 'xpack.security.enabled', 'true'

x-pack/plugin/ccr/build.gradle

@@ -10,8 +10,6 @@ esplugin {
 }
 archivesBaseName = 'x-pack-ccr'
 
-integTest.enabled = false
-
 // Integration Test classes that cannot run with the security manager
 String[] noSecurityManagerITClasses = ["**/CloseFollowerIndexIT.class"]
 

x-pack/plugin/data-streams/build.gradle

@@ -7,7 +7,6 @@ esplugin {
   extendedPlugins = ['x-pack-core']
 }
 archivesBaseName = 'x-pack-data-streams'
-integTest.enabled = false
 
 dependencies {
   compileOnly project(path: xpackModule('core'), configuration: 'default')

x-pack/plugin/deprecation/build.gradle

@@ -13,4 +13,3 @@ dependencies {
   compileOnly project(":x-pack:plugin:core")
 }
 
-integTest.enabled = false

x-pack/plugin/enrich/build.gradle

@@ -17,9 +17,6 @@ dependencies {
   testImplementation project(path: xpackModule('monitoring'), configuration: 'testArtifacts')
 }
 
-// No real integ tests in the module:
-integTest.enabled = false
-
 // add all sub-projects of the qa sub-project
 gradle.projectsEvaluated {
   project.subprojects

x-pack/plugin/eql/build.gradle

@@ -15,9 +15,6 @@ ext {
 
 archivesBaseName = 'x-pack-eql'
 
-// All integration tests live in qa modules
-integTest.enabled = false
-
 dependencies {
   compileOnly project(path: xpackModule('core'), configuration: 'default')
   compileOnly(project(':modules:lang-painless')) {

x-pack/plugin/frozen-indices/build.gradle

@@ -12,8 +12,3 @@ dependencies {
   compileOnly project(path: xpackModule('core'), configuration: 'default')
   testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
 }
-
-// xpack modules are installed in real clusters as the meta plugin, so
-// installing them as individual plugins for integ tests doesn't make sense,
-// so we disable integ tests
-integTest.enabled = false

x-pack/plugin/graph/build.gradle

@@ -22,4 +22,3 @@ gradle.projectsEvaluated {
     .each { check.dependsOn it.check }
 }
 
-integTest.enabled = false