Merge branch 'use-git-rev-parse-for-root' into remote-jars-tests

apache-spark-on-k8s · Jan 10, 2018 · 1dd81f7 · 1dd81f7
2 parents 9a85d86 + 05ef41d
commit 1dd81f7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .idea/
+spark/
 integration-test/target/
 *.class
 *.log
-*.iml
+*.iml
diff --git a/e2e/runner.sh b/e2e/runner.sh
@@ -86,7 +86,7 @@ fi
 
 cd $SPARK_REPO_ROOT
 git checkout -B $BRANCH origin/$BRANCH
-#./dev/make-distribution.sh --tgz -Phadoop-2.7 -Pkubernetes -DskipTests
+./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"
 

diff --git a/integration-test/docker-file-server/nginx.conf b/integration-test/docker-file-server/nginx.conf
@@ -1,14 +1,14 @@
-user  nginx;                                                                                                                                                  
-worker_processes  1;                                                                                                                                          
+user  nginx;
+worker_processes  1;
 
-error_log  /var/log/nginx/error.log warn;                                                                                                                     
-pid        /var/run/nginx.pid;                                                                                                                                
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
 
-events {                                                                                                                                                      
-    worker_connections  1024;                                                                                                                                 
-}                                                                                                                                                             
+events {
+    worker_connections  1024;
+}
 
-http {                                                                                                                                                        
+http {
     server {
         root /opt/spark/jars;
         location /ping {
@@ -18,7 +18,7 @@ http {
     }
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
-                                                                                                                                                              
+
     log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '
                       '"$http_user_agent" "$http_x_forwarded_for"';