From 74e45c0392ba5af3c971168250411d9626ce41f2 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Mon, 26 Mar 2018 22:20:51 +0000
Subject: [PATCH] Update cri validation test version.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 .travis.yml                   | 3 ++-
 daemon_config_linux_test.go   | 2 ++
 script/setup/install-cni      | 1 +
 script/setup/install-critools | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7d30d839b..c4abfa4c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,7 +74,8 @@ script:
   - if [ "$GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH TESTFLAGS_PARALLEL=1 make integration ; fi
   - if [ "$GOOS" = "linux" ]; then
       sudo PATH=$PATH containerd -log-level debug &> /tmp/containerd-cri.log &
-      sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --ginkgo-flags=--nodes=8 validation ;
+      sudo ctr version ;
+      sudo PATH=$PATH GOPATH=$GOPATH critest --runtime-endpoint=/var/run/containerd/containerd.sock --parallel=8 ;
       exit_code=$? ;
       test $exit_code -ne 0 && cat /tmp/containerd-cri.log ;
       sudo pkill containerd ;
diff --git a/daemon_config_linux_test.go b/daemon_config_linux_test.go
index 876cf5bd3..cbb6454a0 100644
--- a/daemon_config_linux_test.go
+++ b/daemon_config_linux_test.go
@@ -127,6 +127,8 @@ func testDaemonRuntimeRoot(t *testing.T, noShim bool) {
  [plugins.linux]
    no_shim = %v
    runtime_root = "%s"
+ [plugins.cri]
+   stream_server_port = "0"
 `, noShim, runtimeRoot)
 
 	client, _, cleanup := newDaemonWithConfig(t, configTOML)
diff --git a/script/setup/install-cni b/script/setup/install-cni
index f077f1645..d1d8f339b 100755
--- a/script/setup/install-cni
+++ b/script/setup/install-cni
@@ -42,6 +42,7 @@ bash -c 'cat >'$CNI_CONFIG_DIR'/10-containerd-net.conflist <<EOF
       "bridge": "cni0",
       "isGateway": true,
       "ipMasq": true,
+      "promiscMode": true,
       "ipam": {
         "type": "host-local",
         "subnet": "10.88.0.0/16",
diff --git a/script/setup/install-critools b/script/setup/install-critools
index 75780a9e6..897c16e4b 100755
--- a/script/setup/install-critools
+++ b/script/setup/install-critools
@@ -20,7 +20,8 @@
 #
 set -eu -o pipefail
 
-CRITEST_COMMIT=b184f9aefe60a4441330e615ee20634ee26474fb
+go get -u github.com/onsi/ginkgo/ginkgo
+CRITEST_COMMIT=207e773f72fde8d8aed1447692d8f800a6686d6c
 go get -d github.com/kubernetes-incubator/cri-tools/...
 cd $GOPATH/src/github.com/kubernetes-incubator/cri-tools
 git checkout $CRITEST_COMMIT