Merge pull request #1672 from jimenez/mesos0.26

Upgrading Mesos integration tests to 0.26.0

cluster/mesos/task/task.go

@@ -219,7 +219,7 @@ func (t *Task) Monitor() (bool, []byte, error) {
 		return true, taskStatus.Data, nil
 	case mesosproto.TaskState_TASK_FAILED:
 		errorMessage := taskStatus.GetMessage()
-		if errorMessage == "Abnormal executor termination" {
+		if strings.Contains(errorMessage, "Abnormal executor termination") {
 			errorMessage += " : please verify your SWARM_MESOS_USER is correctly set"
 		}
 		return true, nil, errors.New(errorMessage)

test/integration/mesos/Dockerfile-0.26.0

@@ -0,0 +1,12 @@
+FROM debian:8
+
+MAINTAINER Victor Vieux <vieux@docker.com>
+MAINTAINER Isabel Jimenez <isabel@mesosphere.com>
+
+RUN apt-get update && apt-get install wget python -y
+RUN wget http://downloads.mesosphere.io/master/debian/8/mesos_0.26.0-0.2.145.debian81_amd64.deb -O /tmp/mesos.deb
+RUN dpkg -i /tmp/mesos.deb || true
+RUN apt-get install -f -y
+
+USER daemon
+

test/integration/mesos/mesos_helpers.bash

@@ -5,7 +5,7 @@
 export SWARM_MESOS_TASK_TIMEOUT=30s
 export SWARM_MESOS_USER=root
 
-MESOS_IMAGE=dockerswarm/mesos:0.25.0
+MESOS_IMAGE=dockerswarm/mesos:0.26.0
 MESOS_MASTER_PORT=$(( ( RANDOM % 1000 )  + 10000 ))
 
 # Start mesos master and agent.