Factor up add pod logs to the build log

Two of the E2E tests include the pod logs in the build log in case
of failure. Factor that up to the tearDown in init_test so that is
available to all existing and future E2E tests.

test/artifact_bucket_test.go

@@ -174,15 +174,6 @@ func TestStorageBucketPipelineRun(t *testing.T) {
 	// Verify status of PipelineRun (wait for it)
 	if err := WaitForPipelineRunState(c, bucketTestPipelineRunName, timeout, PipelineRunSucceed(bucketTestPipelineRunName), "PipelineRunCompleted"); err != nil {
 		t.Errorf("Error waiting for PipelineRun %s to finish: %s", bucketTestPipelineRunName, err)
-		taskruns, err := c.TaskRunClient.List(metav1.ListOptions{})
-		if err != nil {
-			t.Errorf("Error getting TaskRun list for PipelineRun %s %s", bucketTestPipelineRunName, err)
-		}
-		for _, tr := range taskruns.Items {
-			if tr.Status.PodName != "" {
-				CollectPodLogs(c, tr.Status.PodName, namespace, t.Logf)
-			}
-		}
 		t.Fatalf("PipelineRun execution failed")
 	}
 }

test/build_logs.go

@@ -31,7 +31,7 @@ import (
 func CollectPodLogs(c *clients, podName, namespace string, logf logging.FormatLogger) {
 	logs, err := getContainerLogsFromPod(c.KubeClient.Kube, podName, namespace)
 	if err != nil {
-		logf("Expected there to be logs for pod %s: %s", podName, err)
+		logf("Could not get logs for pod %s: %s", podName, err)
 	}
 	logf("build logs %s", logs)
 }

test/helm_task_test.go

@@ -92,15 +92,6 @@ func TestHelmDeployPipelineRun(t *testing.T) {
 	// Verify status of PipelineRun (wait for it)
 	if err := WaitForPipelineRunState(c, helmDeployPipelineRunName, timeout, PipelineRunSucceed(helmDeployPipelineRunName), "PipelineRunCompleted"); err != nil {
 		t.Errorf("Error waiting for PipelineRun %s to finish: %s", helmDeployPipelineRunName, err)
-		taskruns, err := c.TaskRunClient.List(metav1.ListOptions{})
-		if err != nil {
-			t.Errorf("Error getting TaskRun list for PipelineRun %s %s", helmDeployPipelineRunName, err)
-		}
-		for _, tr := range taskruns.Items {
-			if tr.Status.PodName != "" {
-				CollectPodLogs(c, tr.Status.PodName, namespace, t.Logf)
-			}
-		}
 		t.Fatalf("PipelineRun execution failed; helm may or may not have been installed :(")
 	}
 

test/init_test.go

@@ -77,6 +77,16 @@ func tearDown(t *testing.T, cs *clients, namespace string) {
 		} else {
 			t.Log(string(bs))
 		}
+		header(t.Logf, fmt.Sprintf("Dumping logs from Pods in the %s", namespace))
+		taskruns, err := cs.TaskRunClient.List(metav1.ListOptions{})
+		if err != nil {
+			t.Errorf("Error getting TaskRun list %s", err)
+		}
+		for _, tr := range taskruns.Items {
+			if tr.Status.PodName != "" {
+				CollectPodLogs(cs, tr.Status.PodName, namespace, t.Logf)
+			}
+		}
 	}
 
 	t.Logf("Deleting namespace %s", namespace)