Added option to use a particular branch with the e2e script (#24)

* Added option to use a particular branch

* update usage

Author: foxish

README.md

@@ -22,8 +22,8 @@ Kubernetes master is running at https://xyz
 If you want to use a local [minikube](https://github.com/kubernetes/minikube) cluster,
 the minimum tested version is 0.23.0, with the kube-dns addon enabled
 and the recommended configuration is 3 CPUs and 4G of memory. There is also a wrapper
-script for running on minikube, `e2e/e2e-minikube.sh` for testing the apache/spark repo
-in specific.
+script for running on minikube, `e2e/e2e-minikube.sh` for testing the master branch
+of the apache/spark repository in specific.
 
 ```
 $ minikube start --memory 4000 --cpus 3
@@ -39,7 +39,7 @@ Example usages of the script:
 $ ./e2e/runner.sh -m https://xyz -i docker.io/foxish -d cloud
 $ ./e2e/runner.sh -m https://xyz -i test -d minikube
 $ ./e2e/runner.sh -m https://xyz -i test -r https://github.com/my-spark/spark -d minikube
-
+$ ./e2e/runner.sh -m https://xyz -i test -r https://github.com/my-spark/spark -b my-branch -d minikube
 ```
 
 # Detailed Documentation

e2e/runner.sh

@@ -18,7 +18,7 @@
 usage () {
   echo "Usage:"
   echo "    ./e2e/runner.sh -h Display this help message."
-  echo "    ./e2e/runner.sh -m <master-url> -r <spark-repo> -i <image-repo> -d [minikube|cloud]"
+  echo "    ./e2e/runner.sh -m <master-url> -r <spark-repo> -b <branch> -i <image-repo> -d [minikube|cloud]"
   echo "        note that you must have kubectl configured to access the specified"
   echo "        <master-url>. Also you must have access to the <image-repo>. "
   echo "        The deployment mode can be specified using the 'd' flag."
@@ -35,9 +35,10 @@ fi
 REPO="https://github.com/apache/spark"
 IMAGE_REPO="docker.io/kubespark"
 DEPLOY_MODE="minikube"
+BRANCH="master"
 
 ### Parse options ###
-while getopts h:m:r:i:d: option
+while getopts h:m:r:i:d:b: option
 do
  case "${option}"
  in
@@ -47,6 +48,7 @@ do
   ;;
  m) MASTER=${OPTARG};;
  r) REPO=${OPTARG};;
+ b) BRANCH=${OPTARG};;
  i) IMAGE_REPO=${OPTARG};;
  d) DEPLOY_MODE=${OPTARG};;
  \? )
@@ -82,12 +84,14 @@ root=$(pwd)
 # clone spark distribution if needed.
 if [ -d "spark" ];
 then
-  (cd spark && git pull);
+  (cd spark && git pull origin $BRANCH);
 else
   git clone $REPO;
 fi
 
-cd spark && ./dev/make-distribution.sh --tgz -Phadoop-2.7 -Pkubernetes -DskipTests
+cd spark
+git checkout -B $BRANCH origin/$BRANCH
+./dev/make-distribution.sh --tgz -Phadoop-2.7 -Pkubernetes -DskipTests
 tag=$(git rev-parse HEAD | cut -c -6)
 echo "Spark distribution built at SHA $tag"