Skip to content

Commit 9ed0616

Browse files
committed
Fix CI failures due to Hadoop Distro (#1371)
1 parent d4bef1f commit 9ed0616

13 files changed

+15
-18
lines changed

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,24 +162,21 @@ class BuildPlugin implements Plugin<Project> {
162162
println "Using Gradle [${project.gradle.gradleVersion}]"
163163

164164
// Hadoop versions
165-
project.rootProject.ext.hadoopClient = []
166-
project.rootProject.ext.hadoopDistro = project.hasProperty("distro") ? project.getProperty("distro") : "hadoopStable"
167-
165+
project.rootProject.ext.hadoopDistro = project.hasProperty("distro") ? project.getProperty("distro") : "hadoopYarn"
168166
switch (project.rootProject.ext.hadoopDistro) {
169167
// Hadoop YARN/2.0.x
170168
case "hadoopYarn":
171-
String version = project.hadoop2Version
172-
project.rootProject.ext.hadoopVersion = version
173-
project.rootProject.ext.hadoopClient = ["org.apache.hadoop:hadoop-client:$version"]
174-
println "Using Apache Hadoop on YARN [$version]"
169+
project.rootProject.ext.hadoopVersion = project.hadoop2Version
170+
println "Using Apache Hadoop on YARN [$project.hadoop2Version]"
171+
break
172+
case "hadoopStable":
173+
project.rootProject.ext.hadoopVersion = project.hadoop22Version
174+
println "Using Apache Hadoop [$project.hadoop22Version]"
175175
break
176-
177176
default:
178-
String version = project.hadoop22Version
179-
project.rootProject.ext.hadoopVersion = version
180-
project.rootProject.ext.hadoopClient = ["org.apache.hadoop:hadoop-client:$version"]
181-
println "Using Apache Hadoop [$version]"
177+
throw new GradleException("Invalid [hadoopDistro] setting: [$project.rootProject.ext.hadoopDistro]")
182178
}
179+
project.rootProject.ext.hadoopClient = ["org.apache.hadoop:hadoop-client:$project.rootProject.ext.hadoopVersion"]
183180
}
184181
project.ext.eshadoopVersion = project.rootProject.ext.eshadoopVersion
185182
project.ext.elasticsearchVersion = project.rootProject.ext.elasticsearchVersion

licenses/hadoop-client-2.2.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1e81abd78494a0f41f36178152c20e2deb3e9e8d

licenses/hadoop-common-2.2.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b3af0a73d6d3226cd46d4d29c6272a046b90a9f1

licenses/hadoop-mapreduce-client-core-2.2.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fb3b92f837656dbbd2ad5d96f02f09af67c59a17

mr/licenses/hadoop-client-2.2.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1e81abd78494a0f41f36178152c20e2deb3e9e8d

mr/licenses/hadoop-common-2.2.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)