[1/2] mesos git commit: Fixed alicloud unit test for limited timeout.

[ji...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 3ded707ca -> 643dafdec


Fixed alicloud unit test for limited timeout.

Alicloud server is in Asia. We parameterized the unit test
`ROOT_INTERNET_CURL_SimpleCommand` to test different registry with
unifed containerizer. Longer `executor_registration_timeout` should
be given to make sure the image download is not impacted by network
legacy.

Review: https://reviews.apache.org/r/58465/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/265754fa
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/265754fa
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/265754fa

Branch: refs/heads/master
Commit: 265754fae99baeffbafaf2383d396754ba6ca3ff
Parents: 3ded707
Author: Gilbert Song <so...@gmail.com>
Authored: Tue Apr 18 07:57:23 2017 +0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Apr 18 07:57:23 2017 +0800

----------------------------------------------------------------------
 src/tests/containerizer/provisioner_docker_tests.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/265754fa/src/tests/containerizer/provisioner_docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp
index b0a4d21..d1224d8 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -16,6 +16,7 @@
 
 #include <gmock/gmock.h>
 
+#include <stout/duration.hpp>
 #include <stout/gtest.hpp>
 #include <stout/json.hpp>
 #include <stout/os.hpp>
@@ -474,6 +475,10 @@ TEST_P(ProvisionerDockerPullerTest, ROOT_INTERNET_CURL_SimpleCommand)
   flags.isolation = "docker/runtime,filesystem/linux";
   flags.image_providers = "docker";
 
+  // Image pulling time may be long, depending on the location of
+  // the registry server.
+  flags.executor_registration_timeout = Minutes(3);
+
   Owned<MasterDetector> detector = master.get()->createDetector();
   Try<Owned<cluster::Slave>> slave = StartSlave(detector.get(), flags);
   ASSERT_SOME(slave);
@@ -527,7 +532,7 @@ TEST_P(ProvisionerDockerPullerTest, ROOT_INTERNET_CURL_SimpleCommand)
 
   driver.launchTasks(offer.id(), {task});
 
-  AWAIT_READY_FOR(statusRunning, Seconds(60));
+  AWAIT_READY_FOR(statusRunning, Minutes(3));
   EXPECT_EQ(task.task_id(), statusRunning->task_id());
   EXPECT_EQ(TASK_RUNNING, statusRunning->state());
 

[2/2] mesos git commit: Fixed the image signature check for Nexus Registry.

[ji...@apache.org]

Fixed the image signature check for Nexus Registry.

Currently, the signature field of the docker v2 image manifest is
not used yet. The check of at least one image signature is too
strict because some registry (e.g., Nexus Registry) does not sign
the image manifest. We should release the signature check for now.

Review: https://reviews.apache.org/r/58479/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/643dafde
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/643dafde
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/643dafde

Branch: refs/heads/master
Commit: 643dafdec76bb176270fe686ec2400242ed0fe36
Parents: 265754f
Author: Gilbert Song <so...@gmail.com>
Authored: Tue Apr 18 07:57:30 2017 +0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Apr 18 07:57:30 2017 +0800

----------------------------------------------------------------------
 src/docker/spec.cpp | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/643dafde/src/docker/spec.cpp
----------------------------------------------------------------------
diff --git a/src/docker/spec.cpp b/src/docker/spec.cpp
index 88029c2..6b5588e 100644
--- a/src/docker/spec.cpp
+++ b/src/docker/spec.cpp
@@ -332,10 +332,6 @@ Option<Error> validate(const ImageManifest& manifest)
     return Error("'history' field size must be at least one");
   }
 
-  if (manifest.signatures_size() <= 0) {
-    return Error("'signatures' field size must be at least one");
-  }
-
   // Verify that blobSum and v1Compatibility numbers are equal.
   if (manifest.fslayers_size() != manifest.history_size()) {
     return Error("The size of 'fsLayers' should be equal "