Fix tar issues and build distro dependency for integ tests

build.gradle

@@ -142,6 +142,7 @@ subprojects {
             substitute module("org.elasticsearch:test-framework:${version}") with project("${projectsPrefix}:test-framework")
           }
           substitute module("org.elasticsearch.distribution.zip:elasticsearch:${version}") with project("${projectsPrefix}:distribution:zip")
+          substitute module("org.elasticsearch.distribution.tar:elasticsearch:${version}") with project("${projectsPrefix}:distribution:tar")
         }
       }
     }

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy

@@ -228,11 +228,12 @@ class ClusterFormationTasks {
 
     static void configureDistributionDependency(Project project, String distro) {
         String elasticsearchVersion = ElasticsearchProperties.version
+        String packaging = distro == 'tar' ? 'tgz' : distro
         project.configurations {
             elasticsearchDistro
         }
         project.dependencies {
-            elasticsearchDistro "org.elasticsearch.distribution.${distro}:elasticsearch:${elasticsearchVersion}@${distro}"
+            elasticsearchDistro "org.elasticsearch.distribution.${distro}:elasticsearch:${elasticsearchVersion}@${packaging}"
         }
     }
 }

distribution/build.gradle

@@ -41,8 +41,10 @@ allprojects {
 }
 
 subprojects {
+  /*****************************************************************************
+   *                            Rest test config                               *
+   *****************************************************************************/
   apply plugin: 'elasticsearch.rest-test'
-
   integTest {
     includePackaged true
   }

distribution/deb/build.gradle

@@ -20,6 +20,9 @@
 task buildDeb(type: Deb) {
   dependsOn dependencyFiles
 }
+
 artifacts {
   archives buildDeb
 }
+
+integTest.dependsOn buildDeb

distribution/rpm/build.gradle

@@ -20,6 +20,9 @@
 task buildRpm(type: Rpm) {
   dependsOn dependencyFiles
 }
+
 artifacts {
   archives buildRpm
 }
+
+integTest.dependsOn buildRpm

distribution/tar/build.gradle

@@ -24,5 +24,11 @@ task buildTar(type: Tar, dependsOn: dependencyFiles) {
 }
 
 artifacts {
+  'default' buildTar
   archives buildTar
 }
+
+integTest {
+  dependsOn buildTar
+  clusterConfig.distribution = 'tar'
+}

distribution/zip/build.gradle

@@ -27,3 +27,5 @@ artifacts {
   archives buildZip
 }
 
+integTest.dependsOn buildZip
+