Upstream sync

.mailmap

@@ -1,6 +1,7 @@
 Abhinandan Prativadi <abhi@docker.com> Abhinandan Prativadi <aprativadi@gmail.com>
 Abhinandan Prativadi <abhi@docker.com> abhi <abhi@docker.com>
-Akihiro Suda <suda.akihiro@lab.ntt.co.jp> Akihiro Suda <suda.kyoto@gmail.com>
+Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> Akihiro Suda <suda.kyoto@gmail.com>
+Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 Andrei Vagin <avagin@virtuozzo.com> Andrei Vagin <avagin@openvz.org>
 Brent Baude <bbaude@redhat.com> baude <bbaude@redhat.com>
 Frank Yang <yyb196@gmail.com> frank yang <yyb196@gmail.com>

.travis.yml

@@ -74,14 +74,21 @@ script:
   - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH make integration ; fi
   # Run the integration suite a second time. See discussion in github.com/containerd/containerd/pull/1759
   - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration ; fi
-  - if [ "$GOOS" = "linux" ]; then
+  - |
+    if [ "$GOOS" = "linux" ]; then
+      sudo mkdir -p /etc/containerd
+      sudo bash -c "cat > /etc/containerd/config.toml <<EOF
+      [plugins.cri.containerd.default_runtime]
+        runtime_type = \"${TEST_RUNTIME}\"
+    EOF"
       sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log &
-      sudo ctr version ;
-      sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8 ;
-      TEST_RC=$? ;
-      test $TEST_RC -ne 0 && cat /tmp/containerd-cri.log ;
-      sudo pkill containerd ;
-      test $TEST_RC -eq 0 || /bin/false ;
+      sudo ctr version
+      sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8
+      TEST_RC=$?
+      test $TEST_RC -ne 0 && cat /tmp/containerd-cri.log
+      sudo pkill containerd
+      sudo rm -rf /etc/containerd
+      test $TEST_RC -eq 0 || /bin/false
     fi
 
 after_success:

api/next.pb.txt

@@ -4211,28 +4211,61 @@ file {
   dependency: "google/protobuf/empty.proto"
   dependency: "google/protobuf/timestamp.proto"
   message_type {
-    name: "PublishRequest"
+    name: "ForwardRequest"
     field {
-      name: "topic"
+      name: "envelope"
+      number: 1
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".containerd.services.events.ttrpc.v1.Envelope"
+      json_name: "envelope"
+    }
+  }
+  message_type {
+    name: "Envelope"
+    field {
+      name: "timestamp"
       number: 1
       label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".google.protobuf.Timestamp"
+      options {
+        65001: 0
+        65010: 1
+      }
+      json_name: "timestamp"
+    }
+    field {
+      name: "namespace"
+      number: 2
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "namespace"
+    }
+    field {
+      name: "topic"
+      number: 3
+      label: LABEL_OPTIONAL
       type: TYPE_STRING
       json_name: "topic"
     }
     field {
       name: "event"
-      number: 2
+      number: 4
       label: LABEL_OPTIONAL
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Any"
       json_name: "event"
     }
+    options {
+      64400: 1
+    }
   }
   service {
     name: "Events"
     method {
-      name: "Publish"
-      input_type: ".containerd.services.events.ttrpc.v1.PublishRequest"
+      name: "Forward"
+      input_type: ".containerd.services.events.ttrpc.v1.ForwardRequest"
       output_type: ".google.protobuf.Empty"
     }
   }