Convert RunTask to use testclusers, remove ClusterFormationTasks

build.gradle

@@ -17,17 +17,17 @@
  * under the License.
  */
 
+
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.elasticsearch.gradle.BuildPlugin
-import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.BwcVersions
+import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.plugin.PluginBuildPlugin
-import org.elasticsearch.gradle.tool.Boilerplate
-import org.gradle.util.GradleVersion
-import org.gradle.util.DistributionLocator
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
+import org.gradle.util.DistributionLocator
+import org.gradle.util.GradleVersion
 
 import static org.elasticsearch.gradle.tool.Boilerplate.maybeConfigure
 
@@ -449,7 +449,7 @@ class Run extends DefaultTask {
         description = "Enable debugging configuration, to allow attaching a debugger to elasticsearch."
   )
   public void setDebug(boolean enabled) {
-    project.project(':distribution').run.clusterConfig.debug = enabled
+    project.project(':distribution').run.debug = enabled
   }
 }
 task run(type: Run) {

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

@@ -24,7 +24,7 @@ import org.elasticsearch.gradle.NoticeTask
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.test.RestIntegTestTask
-import org.elasticsearch.gradle.test.RunTask
+import org.elasticsearch.gradle.testclusters.RunTask
 import org.elasticsearch.gradle.testclusters.TestClustersPlugin
 import org.elasticsearch.gradle.tool.ClasspathUtils
 import org.gradle.api.InvalidUserDataException
@@ -65,35 +65,28 @@ class PluginBuildPlugin implements Plugin<Project> {
             project.archivesBaseName = name
             project.description = extension1.description
             configurePublishing(project, extension1)
-            if (project.plugins.hasPlugin(TestClustersPlugin.class) == false) {
-                project.integTestCluster.dependsOn(project.tasks.bundlePlugin)
-                if (isModule) {
-                    project.integTestCluster.module(project)
-                } else {
-                    project.integTestCluster.plugin(project.path)
-                }
+
+            project.tasks.integTest.dependsOn(project.tasks.bundlePlugin)
+            if (isModule) {
+                project.testClusters.integTest.module(
+                        project.file(project.tasks.bundlePlugin.archiveFile)
+                )
             } else {
-                project.tasks.integTest.dependsOn(project.tasks.bundlePlugin)
-                if (isModule) {
+                project.testClusters.integTest.plugin(
+                        project.file(project.tasks.bundlePlugin.archiveFile)
+                )
+            }
+
+            project.extensions.getByType(PluginPropertiesExtension).extendedPlugins.each { pluginName ->
+                // Auto add dependent modules to the test cluster
+                if (project.findProject(":modules:${pluginName}") != null) {
+                    project.integTest.dependsOn(project.project(":modules:${pluginName}").tasks.bundlePlugin)
                     project.testClusters.integTest.module(
-                            project.file(project.tasks.bundlePlugin.archiveFile)
-                    )
-                } else {
-                    project.testClusters.integTest.plugin(
-                            project.file(project.tasks.bundlePlugin.archiveFile)
+                            project.file(project.project(":modules:${pluginName}").tasks.bundlePlugin.archiveFile)
                     )
                 }
-
-                project.extensions.getByType(PluginPropertiesExtension).extendedPlugins.each { pluginName ->
-                    // Auto add dependent modules to the test cluster
-                    if (project.findProject(":modules:${pluginName}") != null) {
-                        project.integTest.dependsOn(project.project(":modules:${pluginName}").tasks.bundlePlugin)
-                        project.testClusters.integTest.module(
-                                project.file(project.project(":modules:${pluginName}").tasks.bundlePlugin.archiveFile)
-                        )
-                    }
-                }
             }
+
             if (extension1.name == null) {
                 throw new InvalidUserDataException('name is a required setting for esplugin')
             }
@@ -117,14 +110,6 @@ class PluginBuildPlugin implements Plugin<Project> {
             ]
             buildProperties.expand(properties)
             buildProperties.inputs.properties(properties)
-            project.tasks.run.dependsOn(project.tasks.bundlePlugin)
-            if (isModule) {
-                project.tasks.run.clusterConfig.distribution = System.getProperty(
-                        'run.distribution', isXPackModule ? 'default' : 'oss'
-                )
-            } else {
-                project.tasks.run.clusterConfig.plugin(project.path)
-            }
             if (isModule == false || isXPackModule) {
                 addNoticeGeneration(project, extension1)
             }
@@ -145,7 +130,11 @@ class PluginBuildPlugin implements Plugin<Project> {
         createIntegTestTask(project)
         createBundleTasks(project, extension)
         project.configurations.getByName('default').extendsFrom(project.configurations.getByName('runtime'))
-        project.tasks.create('run', RunTask) // allow running ES with this plugin in the foreground of a build
+        // allow running ES with this plugin in the foreground of a build
+        project.tasks.register('run', RunTask) {
+            dependsOn(project.tasks.bundlePlugin)
+            cluster = project.testClusters.integTest
+        }
     }
 
 
@@ -178,10 +167,6 @@ class PluginBuildPlugin implements Plugin<Project> {
     private static void createIntegTestTask(Project project) {
         RestIntegTestTask integTest = project.tasks.create('integTest', RestIntegTestTask.class)
         integTest.mustRunAfter('precommit', 'test')
-        if (project.plugins.hasPlugin(TestClustersPlugin.class) == false) {
-            // only if not using test clusters
-            project.integTestCluster.distribution = System.getProperty('tests.distribution', 'integ-test-zip')
-        }
         project.check.dependsOn(integTest)
     }