diff options
| author | Reynold Xin <rxin@databricks.com> | 2015-12-21 22:15:52 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-12-21 22:15:52 -0800 |
| commit | 0a38637d05d2338503ecceacfb911a6da6d49538 (patch) | |
| tree | 080b3f2485cd1e2d93f23b764181415df795719d /dev | |
| parent | 29cecd4a42f6969613e5b2a40f2724f99e7eec01 (diff) | |
| download | spark-0a38637d05d2338503ecceacfb911a6da6d49538.tar.gz spark-0a38637d05d2338503ecceacfb911a6da6d49538.tar.bz2 spark-0a38637d05d2338503ecceacfb911a6da6d49538.zip | |
[SPARK-11807] Remove support for Hadoop < 2.2
i.e. Hadoop 1 and Hadoop 2.0
Author: Reynold Xin <rxin@databricks.com>
Closes #10404 from rxin/SPARK-11807.
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/create-release/release-build.sh | 3 | ||||
| -rwxr-xr-x | dev/run-tests-jenkins.py | 4 | ||||
| -rwxr-xr-x | dev/run-tests.py | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index cb79e9eba0..b1895b16b1 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -166,9 +166,6 @@ if [[ "$1" == "package" ]]; then # We increment the Zinc port each time to avoid OOM's and other craziness if multiple builds # share the same Zinc server. - make_binary_release "hadoop1" "-Psparkr -Phadoop-1 -Phive -Phive-thriftserver" "3030" & - make_binary_release "hadoop1-scala2.11" "-Psparkr -Phadoop-1 -Phive -Dscala-2.11" "3031" & - make_binary_release "cdh4" "-Psparkr -Phadoop-1 -Phive -Phive-thriftserver -Dhadoop.version=2.0.0-mr1-cdh4.2.0" "3032" & make_binary_release "hadoop2.3" "-Psparkr -Phadoop-2.3 -Phive -Phive-thriftserver -Pyarn" "3033" & make_binary_release "hadoop2.4" "-Psparkr -Phadoop-2.4 -Phive -Phive-thriftserver -Pyarn" "3034" & make_binary_release "hadoop2.6" "-Psparkr -Phadoop-2.6 -Phive -Phive-thriftserver -Pyarn" "3034" & diff --git a/dev/run-tests-jenkins.py b/dev/run-tests-jenkins.py index 7aecea25b2..42afca0e52 100755 --- a/dev/run-tests-jenkins.py +++ b/dev/run-tests-jenkins.py @@ -163,10 +163,6 @@ def main(): if "test-maven" in ghprb_pull_title: os.environ["AMPLAB_JENKINS_BUILD_TOOL"] = "maven" # Switch the Hadoop profile based on the PR title: - if "test-hadoop1.0" in ghprb_pull_title: - os.environ["AMPLAB_JENKINS_BUILD_PROFILE"] = "hadoop1.0" - if "test-hadoop2.0" in ghprb_pull_title: - os.environ["AMPLAB_JENKINS_BUILD_PROFILE"] = "hadoop2.0" if "test-hadoop2.2" in ghprb_pull_title: os.environ["AMPLAB_JENKINS_BUILD_PROFILE"] = "hadoop2.2" if "test-hadoop2.3" in ghprb_pull_title: diff --git a/dev/run-tests.py b/dev/run-tests.py index 2d4e04c468..17ceba052b 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -301,8 +301,6 @@ def get_hadoop_profiles(hadoop_version): """ sbt_maven_hadoop_profiles = { - "hadoop1.0": ["-Phadoop-1", "-Dhadoop.version=1.2.1"], - "hadoop2.0": ["-Phadoop-1", "-Dhadoop.version=2.0.0-mr1-cdh4.1.1"], "hadoop2.2": ["-Pyarn", "-Phadoop-2.2"], "hadoop2.3": ["-Pyarn", "-Phadoop-2.3", "-Dhadoop.version=2.3.0"], "hadoop2.6": ["-Pyarn", "-Phadoop-2.6"], |