batching test cases and improving logs in host-process-container command line test

test/e2e/windows/host_process.go

@@ -27,6 +27,7 @@ import (
 	"github.com/onsi/ginkgo"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -156,12 +157,17 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 		framework.ExpectEqual(p.Status.Phase, v1.PodSucceeded)
 	})
 
-	ginkgo.It("[SLOW] container command path validation", func() {
+	ginkgo.It("container command path validation", func() {
-		tests := []struct {
+		// The following test cases are broken into batches to speed up the test.
+		// Each batch will be scheduled as a single pod with a container for each test case.
+		// Pods will be scheduled sequentially since the start-up cost of containers is high
+		// on Windows and ginkgo may also schedule test cases in parallel.
+		tests := [][]struct {
 			command    []string
 			args       []string
 			workingDir string
 		}{
+			{
 				{
 					command: []string{"cmd.exe", "/c", "ver"},
 				},
@@ -176,6 +182,8 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 				{
 					command: []string{"%CONTAINER_SANDBOX_MOUNT_POINT%\\bin\\uname.exe", "-o"},
 				},
+			},
+			{
 				{
 					command: []string{"%CONTAINER_SANDBOX_MOUNT_POINT%/bin/uname.exe", "-o"},
 				},
@@ -189,6 +197,8 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 					command:    []string{"bin/uname.exe", "-o"},
 					workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%",
 				},
+			},
+			{
 				{
 					command:    []string{"bin\\uname.exe", "-o"},
 					workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%",
@@ -205,6 +215,8 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 					command:    []string{"uname.exe", "-o"},
 					workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%\\bin\\",
 				},
+			},
+			{
 				{
 					command: []string{"powershell", "cmd.exe", "/ver"},
 				},
@@ -217,6 +229,8 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 				{
 					command: []string{"powershell", "%CONTAINER_SANDBOX_MOUNT_POINT%\\bin\\uname.exe", "-o"},
 				},
+			},
+			{
 				{
 					command: []string{"powershell", "$env:CONTAINER_SANDBOX_MOUNT_POINT\\bin\\uname.exe", "-o"},
 				},
@@ -230,6 +244,8 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 					command:    []string{"powershell", "bin/uname.exe", "-o"},
 					workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%",
 				},
+			},
+			{
 				{
 					command:    []string{"powershell", "bin/uname.exe", "-o"},
 					workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT",
@@ -246,6 +262,8 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 					command:    []string{"powershell", "./uname.exe", "-o"},
 					workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%/bin",
 				},
+			},
+			{
 				{
 					command:    []string{"powershell", "./uname.exe", "-o"},
 					workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT\\bin\\",
@@ -264,6 +282,8 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 					args:       []string{"-o"},
 					workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%\\bin",
 				},
+			},
+			{
 				{
 					command: []string{"cmd.exe"},
 					args:    []string{"/c", "dir", "%CONTAINER_SANDBOX_MOUNT_POINT%\\bin\\uname.exe"},
@@ -282,18 +302,34 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 					args:       []string{"Get-ChildItem", "-Path", "bin\\uname.exe"},
 					workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT",
 				},
+			},
+			{
 				{
 					command:    []string{"powershell"},
 					args:       []string{"Get-ChildItem", "-Path", "uname.exe"},
 					workingDir: "$env:CONTAINER_SANDBOX_MOUNT_POINT/bin",
 				},
+			},
 		}
 
-		for i, testCase := range tests {
+		for podIndex, testCaseBatch := range tests {
-			ginkgo.By(fmt.Sprintf("Creating a container with command: %s, args: %s, workingDir: %s", strings.Join(testCase.command, " "), strings.Join(testCase.args, " "), testCase.workingDir))
-
-			podName := fmt.Sprintf("host-process-command-%d", i)
 			image := imageutils.GetConfig(imageutils.BusyBox)
+			podName := fmt.Sprintf("host-process-command-%d", podIndex)
+			containers := []v1.Container{}
+			for containerIndex, testCase := range testCaseBatch {
+				containerName := fmt.Sprintf("host-process-command-%d-%d", podIndex, containerIndex)
+				ginkgo.By(fmt.Sprintf("Adding a container '%s' to pod '%s' with command: %s, args: %s, workingDir: %s", containerName, podName, strings.Join(testCase.command, " "), strings.Join(testCase.args, " "), testCase.workingDir))
+
+				container := v1.Container{
+					Image:      image.GetE2EImage(),
+					Name:       containerName,
+					Command:    testCase.command,
+					Args:       testCase.args,
+					WorkingDir: testCase.workingDir,
+				}
+				containers = append(containers, container)
+			}
+
 			trueVar := true
 			user := "NT AUTHORITY\\Local Service"
 			pod := &v1.Pod{
@@ -308,15 +344,7 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 						},
 					},
 					HostNetwork:   true,
-					Containers: []v1.Container{
+					Containers:    containers,
-						{
-							Image:      image.GetE2EImage(),
-							Name:       podName,
-							Command:    testCase.command,
-							Args:       testCase.args,
-							WorkingDir: testCase.workingDir,
-						},
-					},
 					RestartPolicy: v1.RestartPolicyNever,
 					NodeSelector: map[string]string{
 						"kubernetes.io/os": "windows",
@@ -325,7 +353,7 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 			}
 			f.PodClient().Create(pod)
 
-			ginkgo.By("Waiting for pod to run")
+			ginkgo.By(fmt.Sprintf("Waiting for pod '%s' to run", podName))
 			f.PodClient().WaitForFinish(podName, 3*time.Minute)
 
 			ginkgo.By("Then ensuring pod finished running successfully")
@@ -335,7 +363,23 @@ var _ = SIGDescribe("[Feature:WindowsHostProcessContainers] [Excluded:WindowsDoc
 				metav1.GetOptions{})
 
 			framework.ExpectNoError(err, "Error retrieving pod")
-			framework.ExpectEqual(p.Status.Phase, v1.PodSucceeded)
+
+			if p.Status.Phase != v1.PodSucceeded {
+				framework.Logf("Getting pod events")
+				options := metav1.ListOptions{
+					FieldSelector: fields.Set{
+						"involvedObject.kind":      "Pod",
+						"involvedObject.name":      podName,
+						"involvedObject.namespace": f.Namespace.Name,
+					}.AsSelector().String(),
+				}
+				events, err := f.ClientSet.CoreV1().Events(f.Namespace.Name).List(context.TODO(), options)
+				framework.ExpectNoError(err, "Error getting events for failed pod")
+				for _, event := range events.Items {
+					framework.Logf("%s: %s", event.Reason, event.Message)
+				}
+				framework.Failf("Pod '%s' did failed.", p.Name)
+			}
 		}
 
 	})