adding support for HDP 2.5 (#641)

h2oai · Dec 21, 2016 · 5bd42a1 · 5bd42a1
1 parent 470ab2d
commit 5bd42a1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/h2o-dist/buildinfo.json b/h2o-dist/buildinfo.json
@@ -73,6 +73,11 @@
             "zip_file_name" : "h2o-SUBST_PROJECT_VERSION-hdp2.4.zip",
             "zip_file_path" : "h2o-SUBST_PROJECT_VERSION-hdp2.4.zip"
         },
+        {
+            "distribution" : "hdp2.5",
+            "zip_file_name" : "h2o-SUBST_PROJECT_VERSION-hdp2.5.zip",
+            "zip_file_path" : "h2o-SUBST_PROJECT_VERSION-hdp2.5.zip"
+        },
         {
             "distribution" : "mapr3.1.1",
             "zip_file_name" : "h2o-SUBST_PROJECT_VERSION-mapr3.1.zip",

diff --git a/h2o-hadoop/h2o-hdp2.5-assembly/build.gradle b/h2o-hadoop/h2o-hdp2.5-assembly/build.gradle
@@ -0,0 +1,8 @@
+ext {
+  hadoopVersion = 'hdp2.5'
+  hadoopMavenArtifactVersion = '2.7.1.2.4.0.0-169'
+  orcSupported = true
+  orcHiveExecVersion = "1.2.1"
+}
+
+apply from: '../assemblyjar.gradle'
diff --git a/h2o-hadoop/h2o-hdp2.5/build.gradle b/h2o-hadoop/h2o-hdp2.5/build.gradle
@@ -0,0 +1,6 @@
+ext {
+  hadoopVersion = 'hdp2.5'
+  hadoopMavenArtifactVersion = '2.7.1.2.4.0.0-169'
+}
+
+apply from: '../driverjar.gradle'
diff --git a/make-dist.sh b/make-dist.sh
@@ -10,7 +10,7 @@ set -x
 
 # Set common variables.
 TOPDIR=$(cd `dirname $0` && pwd)
-HADOOP_VERSIONS="cdh5.2 cdh5.3 cdh5.4 cdh5.5 cdh5.6 cdh5.7 cdh5.8 hdp2.1 hdp2.2 hdp2.3 hdp2.4 mapr3.1 mapr4.0 mapr5.0 mapr5.1"
+HADOOP_VERSIONS="cdh5.2 cdh5.3 cdh5.4 cdh5.5 cdh5.6 cdh5.7 cdh5.8 hdp2.1 hdp2.2 hdp2.3 hdp2.4 hdp2.5 mapr3.1 mapr4.0 mapr5.0 mapr5.1"
 
 function make_zip_common {
   PROJECT_BASE=$1

diff --git a/settings.gradle b/settings.gradle
@@ -48,7 +48,7 @@ if (System.getProperty("user.name").equals("jenkins")
   // Default hadoop build targets
   def allTargets = [
           "cdh5.2", "cdh5.3", "cdh5.4", "cdh5.5", "cdh5.6", "cdh5.7", "cdh5.8",
-          "hdp2.1", "hdp2.2", "hdp2.3", "hdp2.4",
+          "hdp2.1", "hdp2.2", "hdp2.3", "hdp2.4", "hdp2.5",
           "mapr3.1", "mapr4.0", "mapr5.0", "mapr5.1"
   ]
   // Compute targets