From b290a623424b1b5b6a050d5c0e1752166de423b4 Mon Sep 17 00:00:00 2001
From: Isabel Jimenez <contact@isabeljimenez.com>
Date: Fri, 22 Jan 2016 14:05:22 -0500
Subject: [PATCH] Adding mesos 0.26 Dockerfile for tests

Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
---
 cluster/mesos/task/task.go                           |  2 +-
 .../mesos/{Dockerfile-0.25 => Dockerfile-0.25.0}     |  0
 test/integration/mesos/Dockerfile-0.26.0             | 12 ++++++++++++
 test/integration/mesos/mesos_helpers.bash            |  2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)
 rename test/integration/mesos/{Dockerfile-0.25 => Dockerfile-0.25.0} (100%)
 create mode 100644 test/integration/mesos/Dockerfile-0.26.0

diff --git a/cluster/mesos/task/task.go b/cluster/mesos/task/task.go
index 191852eb24..7bb9769bfa 100644
--- a/cluster/mesos/task/task.go
+++ b/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)
diff --git a/test/integration/mesos/Dockerfile-0.25 b/test/integration/mesos/Dockerfile-0.25.0
similarity index 100%
rename from test/integration/mesos/Dockerfile-0.25
rename to test/integration/mesos/Dockerfile-0.25.0
diff --git a/test/integration/mesos/Dockerfile-0.26.0 b/test/integration/mesos/Dockerfile-0.26.0
new file mode 100644
index 0000000000..c62f3e6f42
--- /dev/null
+++ b/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
+
diff --git a/test/integration/mesos/mesos_helpers.bash b/test/integration/mesos/mesos_helpers.bash
index 4eb4fe6e72..3814b9a800 100644
--- a/test/integration/mesos/mesos_helpers.bash
+++ b/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.