From 1eb1d59de8c43eabedfd6d422eca152966b51732 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 19 Mar 2018 16:10:16 -0700 Subject: [PATCH] Build: Fix meta modules to not install as plugin in tests (#29150) This commit fixes the meta plugin build to conditionally install the plugin as a module or plugin, depending on whether it is a module or plugin. --- .../gradle/plugin/MetaPluginBuildPlugin.groovy | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/MetaPluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/MetaPluginBuildPlugin.groovy index 4dc355a4860..fa7e0a6a752 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/MetaPluginBuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/MetaPluginBuildPlugin.groovy @@ -37,19 +37,28 @@ class MetaPluginBuildPlugin implements Plugin { project.plugins.apply(RestTestPlugin) createBundleTask(project) + boolean isModule = project.path.startsWith(':modules:') project.integTestCluster { dependsOn(project.bundlePlugin) - plugin(project.path) } BuildPlugin.configurePomGeneration(project) project.afterEvaluate { PluginBuildPlugin.addZipPomGeneration(project) + if (isModule) { + if (project.integTestCluster.distribution == 'integ-test-zip') { + project.integTestCluster.module(project) + } + } else { + project.integTestCluster.plugin(project.path) + } } RunTask run = project.tasks.create('run', RunTask) run.dependsOn(project.bundlePlugin) - run.clusterConfig.plugin(project.path) + if (isModule == false) { + run.clusterConfig.plugin(project.path) + } } private static void createBundleTask(Project project) {