From 071aeea9d3ff783b2946ef291b1c440aa9b21b88 Mon Sep 17 00:00:00 2001
From: Michael Pratt <mpratt@google.com>
Date: Tue, 27 Nov 2018 09:24:17 -0800
Subject: [PATCH] Disable crictl tests

gvisor-containerd-shim installation is currently broken.

PiperOrigin-RevId: 223002877
Change-Id: I2b890c5bf602a96c475c3805f24852ead8593a35
---
 kokoro/run_tests.sh            | 9 +++++----
 runsc/test/root/crictl_test.go | 9 +++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh
index bfdb3fe09..fb9a7f300 100755
--- a/kokoro/run_tests.sh
+++ b/kokoro/run_tests.sh
@@ -100,10 +100,11 @@ EOF
 )
 
 # Install containerd and crictl.
-if [[ ${exit_code} -eq 0 ]]; then
-  installCrictl
-  exit_code=${?}
-fi
+# FIXME: gvisor-containerd-shim installation broken.
+#if [[ ${exit_code} -eq 0 ]]; then
+#  installCrictl
+#  exit_code=${?}
+#fi
 
 # Execute local tests that require docker.
 if [[ ${exit_code} -eq 0 ]]; then
diff --git a/runsc/test/root/crictl_test.go b/runsc/test/root/crictl_test.go
index 556d95fff..45cbec6b5 100644
--- a/runsc/test/root/crictl_test.go
+++ b/runsc/test/root/crictl_test.go
@@ -37,6 +37,9 @@ import (
 // Tests for crictl have to be run as root (rather than in a user namespace)
 // because crictl creates named network namespaces in /var/run/netns/.
 func TestCrictlSanity(t *testing.T) {
+	// FIXME
+	t.Skip("crictl installation broken")
+
 	// Setup containerd and crictl.
 	crictl, cleanup, err := setup(t)
 	if err != nil {
@@ -59,6 +62,9 @@ func TestCrictlSanity(t *testing.T) {
 	}
 }
 func TestMountPaths(t *testing.T) {
+	// FIXME
+	t.Skip("crictl installation broken")
+
 	// Setup containerd and crictl.
 	crictl, cleanup, err := setup(t)
 	if err != nil {
@@ -81,6 +87,9 @@ func TestMountPaths(t *testing.T) {
 	}
 }
 func TestMountOverSymlinks(t *testing.T) {
+	// FIXME
+	t.Skip("crictl installation broken")
+
 	// Setup containerd and crictl.
 	crictl, cleanup, err := setup(t)
 	if err != nil {