Improve logging for self-hosted e2e test

Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
kubernetes-sigs · Oct 30, 2023 · b76b791 · b76b791
1 parent 0eb51f0
commit b76b791
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/test/e2e/self_hosted.go b/test/e2e/self_hosted.go
@@ -396,6 +396,10 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
 		if selfHostedNamespace != nil {
 			// Dump all Cluster API related resources to artifacts before pivoting back.
 			dumpAllResources(ctx, selfHostedClusterProxy, input.ArtifactFolder, namespace, clusterResources.Cluster)
+
+			// Dump logs from the Machines and infrastructure.
+			input.BootstrapClusterProxy.CollectWorkloadClusterLogs(ctx, namespace.Name, clusterResources.Cluster.Name, filepath.Join(input.ArtifactFolder, "clusters", clusterResources.Cluster.Name))
+
 		}
 		if selfHostedCluster != nil {
 			By("Ensure API servers are stable before doing move")

diff --git a/test/framework/cluster_proxy.go b/test/framework/cluster_proxy.go
@@ -285,6 +285,7 @@ func (p *clusterProxy) GetWorkloadCluster(ctx context.Context, namespace, name s
 // CollectWorkloadClusterLogs collects machines and infrastructure logs and from the workload cluster.
 func (p *clusterProxy) CollectWorkloadClusterLogs(ctx context.Context, namespace, name, outputPath string) {
 	if p.logCollector == nil {
+		fmt.Printf("Failed to get logs for workload Cluster %s: log collector is nil", klog.KRef(namespace, name))
 		return
 	}
 

diff --git a/test/framework/machine_helpers.go b/test/framework/machine_helpers.go
@@ -169,7 +169,7 @@ func WaitForControlPlaneMachinesToBeUpgraded(ctx context.Context, input WaitForC
 			}
 		}
 		if len(machines) > upgraded {
-			return 0, errors.New("old nodes remain")
+			return 0, errors.New("old Machines remain")
 		}
 		return upgraded, nil
 	}, intervals...).Should(Equal(input.MachineCount), "Timed out waiting for all control-plane machines in Cluster %s to be upgraded to kubernetes version %s", klog.KObj(input.Cluster), input.KubernetesUpgradeVersion)
@@ -209,7 +209,7 @@ func WaitForMachineDeploymentMachinesToBeUpgraded(ctx context.Context, input Wai
 			}
 		}
 		if len(machines) > upgraded {
-			return 0, errors.New("old nodes remain")
+			return 0, errors.New("old Machines remain")
 		}
 		return upgraded, nil
 	}, intervals...).Should(Equal(input.MachineCount), "Timed out waiting for all MachineDeployment %s Machines to be upgraded to kubernetes version %s", klog.KObj(&input.MachineDeployment), input.KubernetesUpgradeVersion)