Merge pull request apache#60 from mesosphere/update-build

[SPARK-299] [SPARK-314] mesos profile

Author: mgummelt

bin/jenkins.sh

@@ -13,15 +13,9 @@ function make_distribution {
         if [ -f make-distribution.sh ]; then
             ./make-distribution.sh -Phadoop-2.4 -DskipTests
         else
-            ./dev/make-distribution.sh -Phadoop-2.4 -DskipTests
+            ./dev/make-distribution.sh -Pmesos -Phadoop-2.6 -DskipTests
         fi
 
-        # tmp
-        #wget http://spark-build.s3.amazonaws.com/spark-0738bc281ea93f09c541e47d61b98fe7babc74e0.tgz
-        #tar xvf spark-0738bc281ea93f09c541e47d61b98fe7babc74e0.tgz
-        #rm spark-0738bc281ea93f09c541e47d61b98fe7babc74e0.tgz
-        #mv spark-0738bc281ea93f09c541e47d61b98fe7babc74e0 dist
-
         local DIST="spark-${GIT_COMMIT}"
         mv dist ${DIST}
         tar czf ${DIST}.tgz ${DIST}
@@ -48,7 +42,7 @@ function rename_dist {
 function upload_to_s3 {
     pushd spark
 
-    aws s3 cp \
+    aws --debug s3 cp \
         --acl public-read \
         spark-*.tgz \
         "s3://${S3_BUCKET}/${S3_PREFIX}"

bin/launch-cluster.sh

@@ -28,7 +28,7 @@ CCM_RESPONSE=$(http --ignore-stdin \
                     time=60 \
                     channel=${DCOS_CHANNEL} \
                     cluster_desc="DC/OS Spark testing cluster" \
-                    template=ee.single-master.cloudformation.json \
+                    template=single-master.cloudformation.json \
                     adminlocation=0.0.0.0/0 \
                     public_agents=1 \
                     private_agents=1)

bin/test.sh

@@ -41,7 +41,13 @@ start_cluster() {
     if [ -z "${DCOS_URL}" ]; then
         DCOS_URL=http://$(./bin/launch-cluster.sh)
     fi
-    TOKEN=$(python -c "import requests;js={'uid':'"${DCOS_USERNAME}"', 'password': '"${DCOS_PASSWORD}"'};r=requests.post('"${DCOS_URL}"/acs/api/v1/auth/login',json=js);print(r.json()['token'])")
+
+    # EE
+    #TOKEN=$(python -c "import requests;js={'uid':'"${DCOS_USERNAME}"', 'password': '"${DCOS_PASSWORD}"'};r=requests.post('"${DCOS_URL}"/acs/api/v1/auth/login',json=js);print(r.json()['token'])")
+
+    # Open
+    TOKEN=$(python -c "import requests; import sys; js = {'token':'"${DCOS_OAUTH_TOKEN}"'}; r=requests.post('"${DCOS_URL}"/acs/api/v1/auth/login',json=js); sys.stderr.write(str(r.json())); print(r.json()['token'])")
+
     dcos config set core.dcos_acs_token ${TOKEN}
 }