Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ZEPPELIN-783: reconcile CI-time and build-time Spark download locations

Browse source
This commit is contained in:
Alexander Bezzubov 2016-04-01 12:57:45 +09:00
parent 542a30538d
commit fa8b516ae3
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -12,6 +12,7 @@
spark/derby.log
spark/metastore_db
spark-1.*-bin-hadoop*
.spark-dist
zeppelin-server/derby.log
lens/lens-cli-hist.log

2
.travis.yml
View file

@ -18,7 +18,7 @@ language: java
sudo: false
cache:
directories:
- .spark
- .spark-dist
matrix:
include:

8
spark-dependencies/pom.xml
View file

@ -788,7 +788,7 @@
<configuration>
<url>${spark.download.url}</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/spark-dist</outputDirectory>
<outputDirectory>${project.build.directory}/../../.spark-dist</outputDirectory>
</configuration>
</execution>
</executions>
@ -801,7 +801,7 @@
<directory>${basedir}/../python/build</directory>
</fileset>
<fileset>
<directory>${project.build.directory}/spark-dist</directory>
<directory>${project.build.directory}/../../.spark-dist</directory>
</fileset>
</filesets>
</configuration>
@ -821,9 +821,9 @@
<target>
<delete dir="../interpreter/spark/pyspark"/>
<copy todir="../interpreter/spark/pyspark"
file="${project.build.directory}/spark-dist/spark-${spark.version}/python/lib/py4j-${py4j.version}-src.zip"/>
file="${project.build.directory}/../../.spark-dist/spark-${spark.version}/python/lib/py4j-${py4j.version}-src.zip"/>
<zip destfile="${project.build.directory}/../../interpreter/spark/pyspark/pyspark.zip"
basedir="${project.build.directory}/spark-dist/spark-${spark.version}/python"
basedir="${project.build.directory}/../../.spark-dist/spark-${spark.version}/python"
includes="pyspark/*.py,pyspark/**/*.py"/>
</target>
</configuration>

2
testing/downloadSpark.sh
View file

@ -43,7 +43,7 @@ set -xe
FWDIR="$(dirname "${BASH_SOURCE-$0}")"
ZEPPELIN_HOME="$(cd "${FWDIR}/.."; pwd)"
SPARK_CACHE=".spark"
SPARK_CACHE=".spark-dist"
SPARK_ARCHIVE="spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}"
export SPARK_HOME="${ZEPPELIN_HOME}/${SPARK_CACHE}/${SPARK_ARCHIVE}"
echo "SPARK_HOME is ${SPARK_HOME}"