Fix distros to put modules dir int he right place and qa rest tests to

use the real zip
This commit is contained in:
Ryan Ernst 2015-12-03 23:03:14 -08:00
parent 7245d34f51
commit f5b6b40a92
5 changed files with 4 additions and 8 deletions

View File

@ -34,6 +34,7 @@ class RestTestPlugin implements Plugin<Project> {
integTest.configure {
classpath = project.sourceSets.test.runtimeClasspath
testClassesDir project.sourceSets.test.output.classesDir
cluster.distribution = 'zip' // rest tests should run with the real zip
}
}
}

View File

@ -157,6 +157,9 @@ configure(subprojects.findAll { it.name == 'zip' || it.name == 'tar' || it.name
from('../src/main/resources') {
include 'bin/*.exe'
}
if (project.name != 'integ-test-zip') {
with modulesFiles
}
}
}
}

View File

@ -21,7 +21,6 @@ task buildTar(type: Tar) {
baseName = 'elasticsearch'
extension = 'tar.gz'
with archivesFiles
with modulesFiles
compression = Compression.GZIP
}

View File

@ -20,7 +20,6 @@
task buildZip(type: Zip) {
baseName = 'elasticsearch'
with archivesFiles
with modulesFiles
}
artifacts {

View File

@ -23,12 +23,6 @@ apply plugin: 'elasticsearch.rest-test'
ext.modulesCount = 0
project.rootProject.subprojects.findAll { it.path.startsWith(':modules:') }.each { subproj ->
integTest {
cluster {
// need to get a non-decorated project object, so must re-lookup the project by path
module project(subproj.path)
}
}
modulesCount += 1
}