Repository: incubator-zeppelin Updated Branches: refs/heads/master 58cb48a24 -> 215dd6f36
[ZEPPELIN-956] Download old spark versions direct from archive ### What is this PR for? Older Apache Spark releases seems to have been removed from mirrors, and thus the build scripts needs to be updated to download older releases from the archives. ### What type of PR is it? [Bug Fix] ### What is the Jira issue? [ZEPPELIN-956](https://issues.apache.org/jira/browse/ZEPPELIN-956) ### How should this be tested? Existing build tests Author: Luciano Resende <[email protected]> Closes #967 from lresende/download and squashes the following commits: 4fcbf7b [Luciano Resende] [ZEPPELIN-956] Download old spark versions direct from archive Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/215dd6f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/215dd6f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/215dd6f3 Branch: refs/heads/master Commit: 215dd6f36353a1da04c7f5ea339fb653fb12290b Parents: 58cb48a Author: Luciano Resende <[email protected]> Authored: Sun Jun 5 13:03:20 2016 -0700 Committer: Alexander Bezzubov <[email protected]> Committed: Tue Jun 7 00:11:27 2016 +0200 ---------------------------------------------------------------------- testing/downloadSpark.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/215dd6f3/testing/downloadSpark.sh ---------------------------------------------------------------------- diff --git a/testing/downloadSpark.sh b/testing/downloadSpark.sh index 004e1dd..0575284 100755 --- a/testing/downloadSpark.sh +++ b/testing/downloadSpark.sh @@ -76,15 +76,17 @@ if [[ ! -d "${SPARK_HOME}" ]]; then echo "${SPARK_CACHE} does not have ${SPARK_ARCHIVE} downloading ..." # download archive if not cached - if [[ "${SPARK_VER_RANGE}" == "<=1.2" ]]; then - # spark 1.1.x and spark 1.2.x can be downloaded from archive + if [[ "${SPARK_VERSION}" = "1.1.1" || "${SPARK_VERSION}" = "1.2.2" || "${SPARK_VERSION}" = "1.3.1" || "${SPARK_VERSION}" = "1.4.1" ]]; then + echo "${SPARK_VERSION} being downloaded from archives" + # spark old versions are only available only on the archives (prior to 1.5.2) STARTTIME=`date +%s` #timeout -s KILL "${MAX_DOWNLOAD_TIME_SEC}" wget "http://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/${SPARK_ARCHIVE}.tgz"; download_with_retry "http://archive.apache.org/dist/spark/spark-${SPARK_VERSION}/${SPARK_ARCHIVE}.tgz"; ENDTIME=`date +%s` DOWNLOADTIME="$((ENDTIME-STARTTIME))" else - # spark 1.3.x and later can be downloaded from mirror + echo "${SPARK_VERSION} being downloaded from mirror" + # spark 1.5.2 and up and later can be downloaded from mirror # get download address from mirror MIRROR_INFO=$(curl -s "http://www.apache.org/dyn/closer.cgi/spark/spark-${SPARK_VERSION}/${SPARK_ARCHIVE}.tgz?asjson=1";)
