re-enable marathon app in DCOS cluster validation (#2655)

test/cluster-tests/dcos/test.sh

@@ -50,13 +50,13 @@ function check_node_count() {
 check_node_count
 
 log "Downloading dcos"
-${remote_exec} curl -O https://downloads.dcos.io/binaries/cli/linux/x86-64/dcos-1.8/dcos
+${remote_exec} curl -O https://downloads.dcos.io/binaries/cli/linux/x86-64/dcos-1.10/dcos
 if [[ "$?" != "0" ]]; then log "Failed to download dcos"; exit 1; fi
 log "Setting dcos permissions"
 ${remote_exec} chmod a+x ./dcos
 if [[ "$?" != "0" ]]; then log "Failed to chmod dcos"; exit 1; fi
 log "Configuring dcos"
-${remote_exec} ./dcos config set core.dcos_url http://localhost:80
+${remote_exec} ./dcos cluster setup http://localhost:80
 if [[ "$?" != "0" ]]; then log "Failed to configure dcos"; exit 1; fi
 
 log "Copying marathon.json"

test/e2e/dcos/dcos.go

@@ -128,7 +128,7 @@ func NewCluster(cfg *config.Config, eng *engine.Engine) (*Cluster, error) {
 // InstallDCOSClient will download and place in the path the dcos client
 func (c *Cluster) InstallDCOSClient() error {
 
-	out, err := c.Connection.Execute("curl -O https://downloads.dcos.io/binaries/cli/linux/x86-64/dcos-1.8/dcos")
+	out, err := c.Connection.Execute("curl -O https://downloads.dcos.io/binaries/cli/linux/x86-64/dcos-1.10/dcos")
 	if err != nil {
 		log.Printf("Error downloading DCOS cli:%s\n", err)
 		log.Printf("Output:%s\n", out)
@@ -140,9 +140,9 @@ func (c *Cluster) InstallDCOSClient() error {
 		log.Printf("Output:%s\n", out)
 		return err
 	}
-	out, err = c.Connection.Execute("./dcos config set core.dcos_url http://localhost:80")
+	out, err = c.Connection.Execute("./dcos cluster setup http://localhost:80")
 	if err != nil {
-		log.Printf("Error while trying set core.dcos_url:%s\n", err)
+		log.Printf("Error while trying dcos cluster setup:%s\n", err)
 		log.Printf("Output:%s\n", out)
 		return err
 	}

test/e2e/dcos/dcos_test.go

@@ -1,8 +1,10 @@
 package dcos
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
+	"time"
 
 	"github.com/Azure/acs-engine/pkg/api/common"
 	"github.com/Azure/acs-engine/test/e2e/config"
@@ -61,21 +63,20 @@ var _ = Describe("Azure Container Cluster using the DCOS Orchestrator", func() {
 			Expect(version).To(Equal(expectedVersion))
 		})
 
-		/*It("should be able to install marathon", func() {
+		It("should be able to install marathon", func() {
 			err = cluster.InstallMarathonLB()
 			Expect(err).NotTo(HaveOccurred())
 
 			marathonPath := filepath.Join(cfg.CurrentWorkingDir, "/test/e2e/dcos/marathon.json")
 			port, err := cluster.InstallMarathonApp(marathonPath, 5*time.Second, cfg.Timeout)
 			Expect(err).NotTo(HaveOccurred())
 
-
 			// Need to have a wait for ready check here
 			cmd := fmt.Sprintf("curl -sI http://marathon-lb.marathon.mesos:%v/", port)
 			out, err := cluster.Connection.ExecuteWithRetries(cmd, 5*time.Second, cfg.Timeout)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(out).To(MatchRegexp("^HTTP/1.1 200 OK"))
-		})*/
+		})
 
 	})
 })