DSP-5934: Build Modifications for Jenkins Integration

Author: RussellSpitzer

bin/server_package.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Script for packaging all the job server files to .tar.gz for Mesos or other single-image deploys
-WORK_DIR=/tmp/job-server
+WORK_DIR="$TMPDIR"/tmp/job-server
 
 ENV=$1
 if [ -z "$ENV" ]; then

bin/setenv.sh

@@ -38,7 +38,7 @@ if [ -z "$SPARK_CONF_DIR" ]; then
 fi
 
 if [ -z "$LOG_DIR" ]; then
-  LOG_DIR=/tmp/job-server
+  LOG_DIR="$TMPDIR"/tmp/job-server
   echo "LOG_DIR empty; logging will go to $LOG_DIR"
 fi
 mkdir -p $LOG_DIR

job-server/config/dse.sh

@@ -31,8 +31,6 @@ elif [ -z "$ENV" ]; then
     exit 1
 fi
 
-SPARK_VERSION=1.4.1.1 #Last digit is DSE Specific 
-
 DEPLOY_HOSTS="localhost"
 
 INSTALL_DIR="$DSE_COMPONENTS_ROOT/spark/spark-jobserver"
@@ -41,5 +39,3 @@ LOG_DIR=/var/log/spark/job-server
 PIDFILE=spark-jobserver.pid
 
 SPARK_CONF_DIR=${SPARK_CONF_DIR:-"$SPARK_HOME/conf"}
-
-SCALA_VERSION=2.10.5 # or 2.11.6

version.sbt

@@ -1 +1,3 @@
-version in ThisBuild := "0.6.2.100"
+def currentVersion: String = ("git describe --tags --match v*" !!).trim.substring(1)
+
+version in ThisBuild := currentVersion