remove some cri-o container tests

Because we removed containernetworking-plugins, we can't run containers without ovn-kubernetes.

Author: bitoku

mantle/kola/tests/crio/crio.go

@@ -20,16 +20,11 @@ import (
 	"os"
 	"path"
 	"strings"
-	"time"
-
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/net/context"
 
 	"github.com/coreos/coreos-assembler/mantle/kola"
 	"github.com/coreos/coreos-assembler/mantle/kola/cluster"
 	"github.com/coreos/coreos-assembler/mantle/kola/register"
 	"github.com/coreos/coreos-assembler/mantle/kola/tests/util"
-	"github.com/coreos/coreos-assembler/mantle/lang/worker"
 	"github.com/coreos/coreos-assembler/mantle/platform"
 	"github.com/coreos/coreos-assembler/mantle/platform/conf"
 
@@ -78,7 +73,8 @@ var crioPodTemplate = `{
 			"cgroup_parent": "Burstable-pod-123.slice",
 			"security_context": {
 					"namespace_options": {
-							"pid": 1
+							"pid": 1,
+							"network": 2,
 					},
 					"capabilities": {
 							"add_capabilities": [
@@ -198,25 +194,11 @@ func init() {
 		Tags:        []string{"crio", kola.NeedsInternetTag},
 		RequiredTag: "openshift",
 	})
-	register.RegisterTest(&register.Test{
-		Run:         crioNetwork,
-		ClusterSize: 2,
-		Name:        "crio.network",
-		Description: "Verify crio containers can make network connections outside of the host.",
-		Distros:     []string{"rhcos"},
-		UserData:    enableCrioIgn,
-		// this test requires net connections outside the host
-		Tags:        []string{"crio", kola.NeedsInternetTag},
-		RequiredTag: "openshift",
-		// qemu machines cannot communicate between each other
-		ExcludePlatforms: []string{"qemu"},
-	})
 }
 
 // crioBaseTests executes multiple tests under the "base" name
 func crioBaseTests(c cluster.TestCluster) {
 	c.Run("crio-info", testCrioInfo)
-	c.Run("pod-continues-during-service-restart", crioPodContinuesDuringServiceRestart)
 	c.Run("networks-reliably", crioNetworksReliably)
 }
 
@@ -273,102 +255,6 @@ func genContainer(c cluster.TestCluster, m platform.Machine, podName, imageName
 	return path.Base(configPathPod), path.Base(configPathContainer), nil
 }
 
-// crioNetwork ensures that crio containers can make network connections outside of the host
-func crioNetwork(c cluster.TestCluster) {
-	machines := c.Machines()
-	src, dest := machines[0], machines[1]
-
-	c.Log("creating ncat containers")
-
-	// Since genContainer also generates crio pod/container configs,
-	// there will be a duplicate config file on each machine.
-	// Thus we only save one set for later use.
-	crioConfigPod, crioConfigContainer, err := genContainer(c, src, "ncat", "ncat", []string{"ncat", "echo"}, []string{"ncat"})
-	if err != nil {
-		c.Fatal(err)
-	}
-	_, _, err = genContainer(c, dest, "ncat", "ncat", []string{"ncat", "echo"}, []string{"ncat"})
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	listener := func(ctx context.Context) error {
-		podID, err := c.SSHf(dest, "sudo crictl runp -T %s %s", overrideCrioOperationTimeoutSeconds, crioConfigPod)
-		if err != nil {
-			return err
-		}
-
-		containerID, err := c.SSHf(dest, "sudo crictl create -T %s --no-pull %s %s %s",
-			overrideCrioOperationTimeoutSeconds,
-			podID, crioConfigContainer, crioConfigPod)
-		if err != nil {
-			return err
-		}
-
-		// This command will block until a message is recieved
-		output, err := c.SSHf(dest, "sudo timeout 30 crictl exec %s echo 'HELLO FROM SERVER' | timeout 20 ncat --listen 0.0.0.0 9988 || echo 'LISTENER TIMEOUT'", containerID)
-		if err != nil {
-			return err
-		}
-		if string(output) != "HELLO FROM CLIENT" {
-			return fmt.Errorf("unexpected result from listener: %s", output)
-		}
-
-		return nil
-	}
-
-	talker := func(ctx context.Context) error {
-		// Wait until listener is ready before trying anything
-		for {
-			_, err := c.SSH(dest, "sudo ss -tulpn|grep 9988")
-			if err == nil {
-				break // socket is ready
-			}
-
-			exit, ok := err.(*ssh.ExitError)
-			if !ok || exit.Waitmsg.ExitStatus() != 1 { // 1 is the expected exit of grep -q
-				return err
-			}
-
-			select {
-			case <-ctx.Done():
-				return fmt.Errorf("timeout waiting for server")
-			default:
-				time.Sleep(100 * time.Millisecond)
-			}
-		}
-		podID, err := c.SSHf(src, "sudo crictl runp -T %s %s", overrideCrioOperationTimeoutSeconds, crioConfigPod)
-		if err != nil {
-			return err
-		}
-
-		containerID, err := c.SSHf(src, "sudo crictl create -T %s --no-pull %s %s %s",
-			overrideCrioOperationTimeoutSeconds,
-			podID, crioConfigContainer, crioConfigPod)
-		if err != nil {
-			return err
-		}
-
-		output, err := c.SSHf(src, "sudo crictl exec %s echo 'HELLO FROM CLIENT' | ncat %s 9988",
-			containerID, dest.PrivateIP())
-		if err != nil {
-			return err
-		}
-		if string(output) != "HELLO FROM SERVER" {
-			return fmt.Errorf(`unexpected result from listener: "%s"`, output)
-		}
-
-		return nil
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-
-	if err := worker.Parallel(ctx, listener, talker); err != nil {
-		c.Fatal(err)
-	}
-}
-
 // crioNetworksReliably verifies that crio containers have a reliable network
 func crioNetworksReliably(c cluster.TestCluster) {
 	m := c.Machines()[0]
@@ -394,7 +280,7 @@ func crioNetworksReliably(c cluster.TestCluster) {
 		output = output + string(c.MustSSH(m, fmt.Sprintf("sudo crictl exec %s ping -i 0.2 %s -w 1 >/dev/null && echo PASS || echo FAIL", containerID, hostIP)))
 	}
 
-	numPass := strings.Count(string(output), "PASS")
+	numPass := strings.Count(output, "PASS")
 	if numPass != 10 {
 		c.Fatalf("Expected 10 passes, but received %d passes with output: %s", numPass, output)
 	}
@@ -437,32 +323,3 @@ func testCrioInfo(c cluster.TestCluster) {
 	}
 
 }
-
-// crioPodContinuesDuringServiceRestart verifies that a crio pod does not
-// stop when the service is restarted
-func crioPodContinuesDuringServiceRestart(c cluster.TestCluster) {
-	m := c.Machines()[0]
-
-	crioConfigPod, crioConfigContainer, err := genContainer(
-		c, m, "restart-test", "sleep",
-		[]string{"bash", "sleep", "echo"}, []string{"bash"})
-	if err != nil {
-		c.Fatal(err)
-	}
-	cmdCreatePod := fmt.Sprintf("sudo crictl runp -T %s %s", overrideCrioOperationTimeoutSeconds, crioConfigPod)
-	podID := c.MustSSH(m, cmdCreatePod)
-	containerID := c.MustSSH(m, fmt.Sprintf("sudo crictl create -T %s --no-pull %s %s %s",
-		overrideCrioOperationTimeoutSeconds,
-		podID, crioConfigContainer, crioConfigPod))
-
-	cmd := fmt.Sprintf("sudo crictl exec %s bash -c \"sleep 25 && echo PASS > /tmp/test/restart-test\"", containerID)
-	c.RunCmdSync(m, cmd)
-	time.Sleep(3 * time.Second)
-	c.RunCmdSync(m, "sudo systemctl restart crio")
-	time.Sleep(25 * time.Second)
-	output := strings.TrimSuffix(string(c.MustSSH(m, "cat /tmp/test/restart-test")), "\n")
-
-	if output != "PASS" {
-		c.Fatalf("Pod did not continue during service restart. Output=%s, Command=%s", output, cmd)
-	}
-}