From dd120898bf87aa58f61c6fe7ac1ff76a6f8fcf1e Mon Sep 17 00:00:00 2001 From: mmalohlava Date: Thu, 18 May 2017 16:46:10 -0700 Subject: [PATCH] [PUBDEV-4454] Remove CDH5.2, CDH5.3 and HDP2.1 from build chain --- h2o-dist/buildinfo.json | 15 --------------- h2o-docs/src/product/howto/FAQ.md | 17 ++++++++++++----- h2o-hadoop/h2o-cdh5.2-assembly/build.gradle | 8 -------- h2o-hadoop/h2o-cdh5.2/build.gradle | 8 -------- h2o-hadoop/h2o-cdh5.3-assembly/build.gradle | 8 -------- h2o-hadoop/h2o-cdh5.3/build.gradle | 7 ------- h2o-hadoop/h2o-hdp2.1-assembly/build.gradle | 9 --------- h2o-hadoop/h2o-hdp2.1/build.gradle | 6 ------ make-dist.sh | 2 +- settings.gradle | 7 +++---- 10 files changed, 16 insertions(+), 71 deletions(-) delete mode 100644 h2o-hadoop/h2o-cdh5.2-assembly/build.gradle delete mode 100644 h2o-hadoop/h2o-cdh5.2/build.gradle delete mode 100644 h2o-hadoop/h2o-cdh5.3-assembly/build.gradle delete mode 100644 h2o-hadoop/h2o-cdh5.3/build.gradle delete mode 100644 h2o-hadoop/h2o-hdp2.1-assembly/build.gradle delete mode 100644 h2o-hadoop/h2o-hdp2.1/build.gradle diff --git a/h2o-dist/buildinfo.json b/h2o-dist/buildinfo.json index 80a0c0fb77d..99b4114fed9 100644 --- a/h2o-dist/buildinfo.json +++ b/h2o-dist/buildinfo.json @@ -19,16 +19,6 @@ "hadoop_distributions" : [ { - "distribution" : "cdh5.2", - "zip_file_name" : "h2o-SUBST_PROJECT_VERSION-cdh5.2.zip", - "zip_file_path" : "h2o-SUBST_PROJECT_VERSION-cdh5.2.zip" - }, - { - "distribution" : "cdh5.3", - "zip_file_name" : "h2o-SUBST_PROJECT_VERSION-cdh5.3.zip", - "zip_file_path" : "h2o-SUBST_PROJECT_VERSION-cdh5.3.zip" - }, - { "distribution" : "cdh5.4", "zip_file_name" : "h2o-SUBST_PROJECT_VERSION-cdh5.4.zip", "zip_file_path" : "h2o-SUBST_PROJECT_VERSION-cdh5.4.zip" @@ -54,11 +44,6 @@ "zip_file_path" : "h2o-SUBST_PROJECT_VERSION-cdh5.8.zip" }, { - "distribution" : "hdp2.1", - "zip_file_name" : "h2o-SUBST_PROJECT_VERSION-hdp2.1.zip", - "zip_file_path" : "h2o-SUBST_PROJECT_VERSION-hdp2.1.zip" - }, - { "distribution" : "hdp2.2", "zip_file_name" : "h2o-SUBST_PROJECT_VERSION-hdp2.2.zip", "zip_file_path" : "h2o-SUBST_PROJECT_VERSION-hdp2.2.zip" diff --git a/h2o-docs/src/product/howto/FAQ.md b/h2o-docs/src/product/howto/FAQ.md index f5d423b4d12..886bbf7cf03 100644 --- a/h2o-docs/src/product/howto/FAQ.md +++ b/h2o-docs/src/product/howto/FAQ.md @@ -839,13 +839,20 @@ When you are running H2O on Hadoop, H2O tries to determine the home HDFS directo Each h2odriver.jar file is built with a specific Hadoop distribution so in order to have a working HDFS connection download the h2odriver.jar file for your Hadoop distribution. - wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-cdh5.2.zip - wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-cdh5.3.zip - wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-hdp2.1.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-cdh5.4.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-cdh5.5.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-cdh5.6.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-cdh5.7.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-cdh5.8.zip wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-hdp2.2.zip - wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-hdp2.3.zip - wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-mapr4.0.1.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-hdp2.3.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-hdp2.4.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-hdp2.5.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-hdp2.6.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-mapr4.0.zip wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-mapr5.0.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-mapr5.1.zip + wget http://h2o-release.s3.amazonaws.com/h2o/master/{{build_number}}/h2o-{{project_version}}-iop4.2.zip **Note**: Enter only one of the above commands. diff --git a/h2o-hadoop/h2o-cdh5.2-assembly/build.gradle b/h2o-hadoop/h2o-cdh5.2-assembly/build.gradle deleted file mode 100644 index 1525220449e..00000000000 --- a/h2o-hadoop/h2o-cdh5.2-assembly/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -ext { - hadoopVersion = 'cdh5.2' - hadoopMavenArtifactVersion = '2.5.0-cdh5.2.0' - orcSupported = true - orcHiveExecVersion = '0.13.1-cdh5.2.0' -} - -apply from: '../assemblyjar.gradle' diff --git a/h2o-hadoop/h2o-cdh5.2/build.gradle b/h2o-hadoop/h2o-cdh5.2/build.gradle deleted file mode 100644 index 7c7e5a497b8..00000000000 --- a/h2o-hadoop/h2o-cdh5.2/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -ext { - hadoopVersion = 'cdh5.2' - hadoopMavenArtifactVersion = '2.5.0-cdh5.2.0' - orcSupported = false -} - -apply from: '../driverjar.gradle' - diff --git a/h2o-hadoop/h2o-cdh5.3-assembly/build.gradle b/h2o-hadoop/h2o-cdh5.3-assembly/build.gradle deleted file mode 100644 index d257a648aa7..00000000000 --- a/h2o-hadoop/h2o-cdh5.3-assembly/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -ext { - hadoopVersion = 'cdh5.3' - hadoopMavenArtifactVersion = '2.5.0-cdh5.3.0' - orcSupported = true - orcHiveExecVersion = '0.13.1-cdh5.3.0' -} - -apply from: '../assemblyjar.gradle' diff --git a/h2o-hadoop/h2o-cdh5.3/build.gradle b/h2o-hadoop/h2o-cdh5.3/build.gradle deleted file mode 100644 index e4125a4240f..00000000000 --- a/h2o-hadoop/h2o-cdh5.3/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -ext { - hadoopVersion = 'cdh5.3' - hadoopMavenArtifactVersion = '2.5.0-cdh5.3.0' -} - -apply from: '../driverjar.gradle' - diff --git a/h2o-hadoop/h2o-hdp2.1-assembly/build.gradle b/h2o-hadoop/h2o-hdp2.1-assembly/build.gradle deleted file mode 100644 index a50f2cc92f8..00000000000 --- a/h2o-hadoop/h2o-hdp2.1-assembly/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -ext { - hadoopVersion = 'hdp2.1' - hadoopMavenArtifactVersion = '2.4.0.2.1.1.0-385' - orcSupported = true - orcHiveExecVersion = "0.13.0" - -} - -apply from: '../assemblyjar.gradle' diff --git a/h2o-hadoop/h2o-hdp2.1/build.gradle b/h2o-hadoop/h2o-hdp2.1/build.gradle deleted file mode 100644 index cb12a9b9ce6..00000000000 --- a/h2o-hadoop/h2o-hdp2.1/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -ext { - hadoopVersion = 'hdp2.1' - hadoopMavenArtifactVersion = '2.4.0.2.1.1.0-385' -} - -apply from: '../driverjar.gradle' diff --git a/make-dist.sh b/make-dist.sh index af7e30dbde6..db615779867 100755 --- 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 hdp2.5 hdp2.6 mapr4.0 mapr5.0 mapr5.1 iop4.2" +HADOOP_VERSIONS="cdh5.4 cdh5.5 cdh5.6 cdh5.7 cdh5.8 hdp2.2 hdp2.3 hdp2.4 hdp2.5 hdp2.6 mapr4.0 mapr5.0 mapr5.1 iop4.2" function make_zip_common { PROJECT_BASE=$1 diff --git a/settings.gradle b/settings.gradle index 6f9d2e97b28..7b4f6b97a74 100644 --- a/settings.gradle +++ b/settings.gradle @@ -55,9 +55,9 @@ 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.5", "hdp2.6", - "mapr4.0", "mapr5.0", "mapr5.1","iop4.2" + "cdh5.4", "cdh5.5", "cdh5.6", "cdh5.7", "cdh5.8", + "hdp2.2", "hdp2.3", "hdp2.4", "hdp2.5", "hdp2.6", + "mapr4.0", "mapr5.0", "mapr5.1","iop4.2" ] // Compute targets def targets = System.getenv("H2O_TARGET") != null ? System.getenv("H2O_TARGET").split(",").collect { it.trim() } : allTargets @@ -66,7 +66,6 @@ if (System.getProperty("user.name").equals("jenkins") targets.each { name -> include "h2o-hadoop:h2o-${name}" include "h2o-hadoop:h2o-${name}-assembly" - } } }