Merge pull request #7928 from sbueringer/pr-fix-self-hosted-test-cleanup

🐛 test/e2e: Fix cluster cleanup in self-hosted test

Author: k8s-ci-robot

scripts/ci-e2e.sh

@@ -86,6 +86,16 @@ cleanup() {
   ctr -n moby containers list > "${ARTIFACTS_LOCAL}/containerd-containers.txt" || true
   ctr -n moby images list > "${ARTIFACTS_LOCAL}/containerd-images.txt" || true
   ctr -n moby version > "${ARTIFACTS_LOCAL}/containerd-version.txt" || true
+
+  # Verify that no containers are running at this time
+  # Note: This verifies that all our tests clean up clusters correctly.
+  if [[ ! "$(docker ps -q | wc -l)" -eq "0" ]]
+  then
+     echo "ERROR: Found unexpected running containers:"
+     echo ""
+     docker ps
+     exit 1
+  fi
 }
 trap "cleanup" EXIT SIGINT
 

test/e2e/self_hosted.go

@@ -232,7 +232,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
 		// object. The Cluster object has special processing for the paused field during the move to
 		// avoid having clusterctl as the manager of the field.
 		log.Logf("Ensure clusterctl does not take ownership on any fields on the self-hosted cluster")
-		selfHostedCluster := framework.GetClusterByName(ctx, framework.GetClusterByNameInput{
+		selfHostedCluster = framework.GetClusterByName(ctx, framework.GetClusterByNameInput{
 			Getter:    selfHostedClusterProxy.GetClient(),
 			Name:      cluster.Name,
 			Namespace: selfHostedNamespace.Name,