Fix repository-hdfs when no docker and unnecesary fixture

The hdfs-fixture is actually executed in plugin/repository-hdfs as a
dependency. The fixture is not needed and actually causes a failure
because we have two copies now and both use the same ports.
This commit is contained in:
Alpar Torok 2019-03-29 16:46:55 +02:00
parent 2b91fb1cc0
commit 293297ae3d
3 changed files with 2 additions and 26 deletions

View File

@ -79,6 +79,7 @@ for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture',
dependsOn project.configurations.hdfsFixture, project(':test:fixtures:krb5kdc-fixture').tasks.postProcessFixture
executable = new File(project.runtimeJavaHome, 'bin/java')
env 'CLASSPATH', "${ -> project.configurations.hdfsFixture.asPath }"
onlyIf { project(':test:fixtures:krb5kdc-fixture').buildFixture.enabled }
waitCondition = { fixture, ant ->
// the hdfs.MiniHDFS fixture writes the ports file when
// it's ready, so we can just wait for the file to exist

View File

@ -18,23 +18,10 @@
*/
apply plugin: 'elasticsearch.build'
apply plugin: 'elasticsearch.test.fixtures'
dependencies {
compile "org.apache.hadoop:hadoop-minicluster:2.8.1"
}
task syncClasses(type: Sync) {
from sourceSets.test.runtimeClasspath
into "${buildDir}/fixture"
}
preProcessFixture {
dependsOn syncClasses
doLast {
file("${buildDir}/shared").mkdirs()
}
}
unitTest.enabled = false
thirdPartyAudit.enabled = false

View File

@ -1,12 +0,0 @@
version: '3'
services:
hdfs:
hostname: hdfs.build.elastic.co
image: ubuntu:14.04
volumes:
- ./build/fixture:/fixture
ports:
# FIXME: Don't fix the host ports
- "9999:9999"
- "9998:9999"
entrypoint: apt-get update && apt-get install net-tools && java -cp "/fixture:/fixture/*" hdfs.MiniHDFS /data