Merge "Update Spark version"
This commit is contained in:
commit
0eb8e9dc2c
|
@ -33,9 +33,9 @@ SPARK_DIRECTORIES=("/var/spark" "/var/log/spark" "/var/run/spark/work" "/etc/spa
|
||||||
|
|
||||||
JDK_PKG="openjdk-8-jre-headless openjdk-8-jdk"
|
JDK_PKG="openjdk-8-jre-headless openjdk-8-jdk"
|
||||||
|
|
||||||
MAVEN="apache-maven-3.3.9"
|
MAVEN="apache-maven-3.5.3"
|
||||||
MAVEN_TARBAL="$MAVEN-bin.tar.gz"
|
MAVEN_TARBAL="$MAVEN-bin.tar.gz"
|
||||||
MAVEN_URL="ftp://mirror.reverse.net/pub/apache/maven/maven-3/3.3.9/binaries/$MAVEN_TARBAL"
|
MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/$MAVEN_TARBAL"
|
||||||
|
|
||||||
SCALA_VERSION=${SCALA_VERSION:-2.11}
|
SCALA_VERSION=${SCALA_VERSION:-2.11}
|
||||||
SCALA_MIN_VERSION=${SCALA_MIN_VERSION:-.7}
|
SCALA_MIN_VERSION=${SCALA_MIN_VERSION:-.7}
|
||||||
|
@ -45,7 +45,7 @@ KEYID=642AC823
|
||||||
|
|
||||||
SPARK_DIR="/opt/spark"
|
SPARK_DIR="/opt/spark"
|
||||||
SPARK_DOWNLOAD="$SPARK_DIR/download"
|
SPARK_DOWNLOAD="$SPARK_DIR/download"
|
||||||
SPARK_VERSION=${SPARK_VERSION:-1.6.1}
|
SPARK_VERSION=${SPARK_VERSION:-2.1.0}
|
||||||
SPARK_TARBALL_NAME="spark-${SPARK_VERSION}.tgz"
|
SPARK_TARBALL_NAME="spark-${SPARK_VERSION}.tgz"
|
||||||
SPARK_URL="http://archive.apache.org/dist/spark/spark-$SPARK_VERSION/$SPARK_TARBALL_NAME"
|
SPARK_URL="http://archive.apache.org/dist/spark/spark-$SPARK_VERSION/$SPARK_TARBALL_NAME"
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
HOME=${HOME:-/home/jenkins}
|
HOME=${HOME:-/home/jenkins}
|
||||||
SPARK_DIR=$HOME/spark
|
SPARK_DIR=$HOME/spark
|
||||||
SPARK_VERSION=${SPARK_VERSION:-1.6.1}
|
SPARK_VERSION=${SPARK_VERSION:-2.1.0}
|
||||||
SPARK_TARBALL_NAME=spark-$SPARK_VERSION.tgz
|
SPARK_TARBALL_NAME=spark-$SPARK_VERSION.tgz
|
||||||
SPARK_URL=http://archive.apache.org/dist/spark/spark-$SPARK_VERSION/$SPARK_TARBALL_NAME
|
SPARK_URL=http://archive.apache.org/dist/spark/spark-$SPARK_VERSION/$SPARK_TARBALL_NAME
|
||||||
|
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -9,7 +9,7 @@ setenv =
|
||||||
PYTHONUNBUFFERED=1
|
PYTHONUNBUFFERED=1
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
DISCOVER_DIRECTORY=tests
|
DISCOVER_DIRECTORY=tests
|
||||||
PYTHONPATH={homedir}/spark/spark-1.6.1/python:{homedir}/spark/spark-1.6.1/python/lib/py4j-0.9-src.zip:
|
PYTHONPATH={homedir}/spark/spark-2.1.0/python:{homedir}/spark/spark-2.1.0/python/lib/py4j-0.10.4-src.zip:
|
||||||
install_command = pip install -U {opts} {packages}
|
install_command = pip install -U {opts} {packages}
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
@ -26,7 +26,7 @@ setenv = VIRTUAL_ENV={envdir}
|
||||||
NOSE_COVER_BRANCHES=1
|
NOSE_COVER_BRANCHES=1
|
||||||
NOSE_COVER_HTML=1
|
NOSE_COVER_HTML=1
|
||||||
NOSE_COVER_HTML_DIR={toxinidir}/cover
|
NOSE_COVER_HTML_DIR={toxinidir}/cover
|
||||||
PYTHONPATH={homedir}/spark/spark-1.6.1/python:{homedir}/spark/spark-1.6.1/python/lib/py4j-0.9-src.zip:
|
PYTHONPATH={homedir}/spark/spark-2.1.0/python:{homedir}/spark/spark-2.1.0/python/lib/py4j-0.10.4-src.zip:
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
|
Loading…
Reference in New Issue