more travis setup

Author: Lee Yang

.travis.yml

@@ -4,8 +4,7 @@ matrix:
     python: 2.7
     dist: xenial
     before_install:
-    - source scripts/travis_install_spark.sh
-    - pip install --upgrade pip
+    - source scripts/travis_before_install.sh
     install:
     - pip install -r requirements.txt
     - pip install mock
@@ -15,8 +14,7 @@ matrix:
     python: 3.6
     dist: xenial
     before_install:
-    - source scripts/travis_install_spark.sh
-    - pip install --upgrade pip
+    - source scripts/travis_before_install.sh
     install:
     - pip install -r requirements.txt
     - pip list

scripts/travis_install_spark.sh renamed to scripts/travis_before_install.sh

@@ -4,10 +4,10 @@
 # But Travis' xenial build env uses JDK11, while Spark requires JDK8
 
 # Install JDK8
-add-apt-repository -y ppa:openjdk-r/ppa
-apt-get update
-apt-get install -y openjdk-8-jdk --no-install-recommends
-update-java-alternatives -s java-1.8.0-openjdk-amd64
+sudo add-apt-repository -y ppa:openjdk-r/ppa
+sudo apt-get update
+sudo apt-get install -y openjdk-8-jdk --no-install-recommends
+sudo update-java-alternatives -s java-1.8.0-openjdk-amd64
 
 # Download and install Spark
 curl -LO http://www-us.apache.org/dist/spark/spark-2.4.4/spark-2.4.4-bin-hadoop2.7.tgz
@@ -17,5 +17,13 @@ tar -xf spark-2.4.4-bin-hadoop2.7.tgz -C $SPARK_HOME --strip-components=1
 export SPARK_LOCAL_IP=127.0.0.1
 export SPARK_CLASSPATH=./lib/tensorflow-hadoop-1.0-SNAPSHOT.jar
 export PATH=$SPARK_HOME/bin:$PATH
-export PYTHONPATH=$(pwd)
 export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+
+# Update Python
+pip install --upgrade pip
+export PYTHONPATH=$(pwd)
+
+# Echo versions
+java -version
+pyspark --version
+python --version