From e442a34acc775434e5b69d85ac5e0c06ab93de72 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Thu, 18 Jan 2018 11:14:56 -0800 Subject: [PATCH] Build: Fix meta plugin integ test installation (#28286) Integ test clusters should use the plugin method of ClusterConfiguration to install plugins. Without it, meta plugins install based on the name of the project directory, rather than the actual configured plugin name. This commit fixes that, and also corrects the distribution used to be the default integ-test-zip, to match that of PluginBuildPlugin. This ensures plugins are tested in isolation by default. --- .../elasticsearch/gradle/plugin/MetaPluginBuildPlugin.groovy | 3 +-- 1 file changed, 1 insertion(+), 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 8cdaa11c4d7..fbef0d8e497 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/MetaPluginBuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/MetaPluginBuildPlugin.groovy @@ -40,8 +40,7 @@ class MetaPluginBuildPlugin implements Plugin { project.integTestCluster { dependsOn(project.bundlePlugin) - distribution = 'zip' - setupCommand('installMetaPlugin', 'bin/elasticsearch-plugin', 'install', 'file:' + project.bundlePlugin.archivePath) + plugin(project.path) } RunTask run = project.tasks.create('run', RunTask)