From dca614aa3bcc2c3b6a7de80ba50c1647e62aa166 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Tue, 18 Oct 2016 11:48:58 -0700
Subject: [PATCH] Build: Change `gradle run` to use zip distribution (#21001)

When running `gradle run`, a developer usually intends to get a running
instance as if they had run elasticsearch from the command line. This is
different than the isolated environment we use for integration testing
plugins. This change switches the run task to use the zip distribution,
so that all modules included in the normal distribution are included.
---
 .../main/groovy/org/elasticsearch/gradle/test/RunTask.groovy | 1 +
 modules/build.gradle                                         | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RunTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RunTask.groovy
index f045c95740b..a71dc59dbf9 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RunTask.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RunTask.groovy
@@ -16,6 +16,7 @@ public class RunTask extends DefaultTask {
         clusterConfig.httpPort = 9200
         clusterConfig.transportPort = 9300
         clusterConfig.daemonize = false
+        clusterConfig.distribution = 'zip'
         project.afterEvaluate {
             ClusterFormationTasks.setup(project, this, clusterConfig)
         }
diff --git a/modules/build.gradle b/modules/build.gradle
index d5b207625c1..b3dbde24936 100644
--- a/modules/build.gradle
+++ b/modules/build.gradle
@@ -25,6 +25,11 @@ subprojects {
     // for local ES plugins, the name of the plugin is the same as the directory
     name project.name
   }
+  
+  run {
+    // these cannot be run with the normal distribution, since they are included in it!
+    distribution = 'integ-test-zip'
+  }
 
   if (project.file('src/main/packaging').exists()) {
     throw new InvalidModelException("Modules cannot contain packaging files")