#436 Upgraded to Mesos 0.28.1

ContainerSolutions · Jul 6, 2016 · 94d40c3 · 94d40c3
1 parent a47e6c5
commit 94d40c3
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 20 deletions.
diff --git a/cli/src/test/resources/configFiles/complete-minimesosFile b/cli/src/test/resources/configFiles/complete-minimesosFile
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     agent {

diff --git a/cli/src/test/resources/configFiles/marathonAppConfig-minimesosFile b/cli/src/test/resources/configFiles/marathonAppConfig-minimesosFile
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     agent {

diff --git a/cli/src/test/resources/configFiles/minimal-minimesosFile b/cli/src/test/resources/configFiles/minimal-minimesosFile
@@ -3,6 +3,6 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 }
diff --git a/cli/src/test/resources/configFiles/withMarathon-minimesosFile b/cli/src/test/resources/configFiles/withMarathon-minimesosFile
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     marathon {

diff --git a/minimesos/src/main/groovy/com/containersol/minimesos/config/MesosContainerConfig.groovy b/minimesos/src/main/groovy/com/containersol/minimesos/config/MesosContainerConfig.groovy
@@ -5,14 +5,17 @@ abstract class MesosContainerConfig extends ContainerConfigBlock implements Cont
     public static final String MESOS_IMAGE_TAG = "# derive from mesos version"
     public static final String MESOS_LOGGING_LEVEL_INHERIT = "# INHERIT FROM CLUSTER"
 
+    private String loggingLevel = MESOS_LOGGING_LEVEL_INHERIT
+
     public static final HashMap<String, String> MESOS_IMAGE_TAGS = [
-            "0.25": "0.25.0-0.2.70.ubuntu1404",
-            "0.26": "0.26.0-0.2.145.ubuntu1404",
-            "0.27": "0.27.1-2.0.226.ubuntu1404"
+            "0.25":     "0.25.0-0.2.70.ubuntu1404",
+            "0.26":     "0.26.0-0.2.145.ubuntu1404",
+            "0.27":     "0.27.1-2.0.226.ubuntu1404",
+            "0.28.0":   "0.28.0-2.0.16.ubuntu1404",
+            "0.28.1":   "0.28.1-2.0.20.ubuntu1404",
+            "0.28":     "0.28.1-2.0.20.ubuntu1404"
     ]
 
-    private String loggingLevel = MESOS_LOGGING_LEVEL_INHERIT
-
     public String getLoggingLevel() {
         return loggingLevel
     }

diff --git a/minimesos/src/test/resources/configFiles/minimal-minimesosFile b/minimesos/src/test/resources/configFiles/minimal-minimesosFile
@@ -3,6 +3,6 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 }
diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-authenticationTest b/minimesos/src/test/resources/configFiles/minimesosFile-authenticationTest
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     master {

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-consulRegistrationTest b/minimesos/src/test/resources/configFiles/minimesosFile-consulRegistrationTest
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = true
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     agent {

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-defaultMinimumClusterTest b/minimesos/src/test/resources/configFiles/minimesosFile-defaultMinimumClusterTest
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = true
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     agent {

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-dynamicClusterTest b/minimesos/src/test/resources/configFiles/minimesosFile-dynamicClusterTest
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     agent {

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-mesosClusterTest b/minimesos/src/test/resources/configFiles/minimesosFile-mesosClusterTest
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = true
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     agent {

diff --git a/minimesos/src/test/resources/configFiles/minimesosFile-runTaskTest b/minimesos/src/test/resources/configFiles/minimesosFile-runTaskTest
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     agent {

diff --git a/test-framework-docker/executor/Dockerfile b/test-framework-docker/executor/Dockerfile
@@ -1,4 +1,4 @@
-FROM containersol/mesos-agent:0.25.0-0.2.70.ubuntu1404
+FROM containersol/mesos-agent:0.28.1-2.0.20.ubuntu1404
 
 ADD ./build/docker/mesos-hello-world-executor.jar /tmp/mesos-hello-world-executor.jar
 ADD ./build/docker/start-executor.sh /tmp/start-executor.sh

diff --git a/test-framework-docker/scheduler/Dockerfile b/test-framework-docker/scheduler/Dockerfile
@@ -1,4 +1,4 @@
-FROM containersol/mesos-master:0.25.0-0.2.70.ubuntu1404
+FROM containersol/mesos-master:0.28.1-2.0.20.ubuntu1404
 
 ADD ./build/docker/mesos-hello-world-scheduler.jar /tmp/mesos-hello-world-scheduler.jar
 ADD ./build/docker/start-scheduler.sh /tmp/start-scheduler.sh

diff --git a/...ework-docker/system-test/src/test/resources/configFiles/minimesosFile-discoverySystemTest b/...ework-docker/system-test/src/test/resources/configFiles/minimesosFile-discoverySystemTest
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     agent {

diff --git a/...work-docker/system-test/src/test/resources/configFiles/minimesosFile-install-command-test b/...work-docker/system-test/src/test/resources/configFiles/minimesosFile-install-command-test
@@ -3,7 +3,7 @@ minimesos {
     mapPortsToHost = false
     loggingLevel = "INFO"
     mapAgentSandboxVolume = false
-    mesosVersion = "0.25"
+    mesosVersion = "0.28"
     timeout = 60
 
     agent {