Skip to content

Commit c820549

Browse files
committed
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.
1 parent 56d9a74 commit c820549

File tree

3 files changed

+2
-26
lines changed

3 files changed

+2
-26
lines changed

plugins/repository-hdfs/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture',
7979
dependsOn project.configurations.hdfsFixture, project(':test:fixtures:krb5kdc-fixture').tasks.postProcessFixture
8080
executable = new File(project.runtimeJavaHome, 'bin/java')
8181
env 'CLASSPATH', "${ -> project.configurations.hdfsFixture.asPath }"
82+
onlyIf { project(':test:fixtures:krb5kdc-fixture').buildFixture.enabled }
8283
waitCondition = { fixture, ant ->
8384
// the hdfs.MiniHDFS fixture writes the ports file when
8485
// it's ready, so we can just wait for the file to exist

test/fixtures/hdfs-fixture/build.gradle

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,10 @@
1818
*/
1919

2020
apply plugin: 'elasticsearch.build'
21-
apply plugin: 'elasticsearch.test.fixtures'
2221

2322
dependencies {
2423
compile "org.apache.hadoop:hadoop-minicluster:2.8.1"
2524
}
2625

27-
task syncClasses(type: Sync) {
28-
from sourceSets.test.runtimeClasspath
29-
into "${buildDir}/fixture"
30-
}
31-
32-
preProcessFixture {
33-
dependsOn syncClasses
34-
35-
doLast {
36-
file("${buildDir}/shared").mkdirs()
37-
}
38-
}
39-
4026
unitTest.enabled = false
27+
thirdPartyAudit.enabled = false

test/fixtures/hdfs-fixture/docker-compose.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)