Skip to content

Commit ab6c478

Browse files
authored
Fix CI failures due to Hadoop Distro (#1371)
1 parent bb97ac4 commit ab6c478

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
@@ -160,24 +160,21 @@ class BuildPlugin implements Plugin<Project> {
160160
println "Using Gradle [${project.gradle.gradleVersion}]"
161161

162162
// Hadoop versions
163-
project.rootProject.ext.hadoopClient = []
164-
project.rootProject.ext.hadoopDistro = project.hasProperty("distro") ? project.getProperty("distro") : "hadoopStable"
165-
163+
project.rootProject.ext.hadoopDistro = project.hasProperty("distro") ? project.getProperty("distro") : "hadoopYarn"
166164
switch (project.rootProject.ext.hadoopDistro) {
167165
// Hadoop YARN/2.0.x
168166
case "hadoopYarn":
169-
String version = project.hadoop2Version
170-
project.rootProject.ext.hadoopVersion = version
171-
project.rootProject.ext.hadoopClient = ["org.apache.hadoop:hadoop-client:$version"]
172-
println "Using Apache Hadoop on YARN [$version]"
167+
project.rootProject.ext.hadoopVersion = project.hadoop2Version
168+
println "Using Apache Hadoop on YARN [$project.hadoop2Version]"
169+
break
170+
case "hadoopStable":
171+
project.rootProject.ext.hadoopVersion = project.hadoop22Version
172+
println "Using Apache Hadoop [$project.hadoop22Version]"
173173
break
174-
175174
default:
176-
String version = project.hadoop22Version
177-
project.rootProject.ext.hadoopVersion = version
178-
project.rootProject.ext.hadoopClient = ["org.apache.hadoop:hadoop-client:$version"]
179-
println "Using Apache Hadoop [$version]"
175+
throw new GradleException("Invalid [hadoopDistro] setting: [$project.rootProject.ext.hadoopDistro]")
180176
}
177+
project.rootProject.ext.hadoopClient = ["org.apache.hadoop:hadoop-client:$project.rootProject.ext.hadoopVersion"]
181178
}
182179
project.ext.eshadoopVersion = project.rootProject.ext.eshadoopVersion
183180
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)