Merge pull request #1888 from rancher/fix_artifacts_collection_e2e

ci: fix artifacts collection at the end of e2e tests

Author: anmazzotti

test/e2e/suites/capiprovider/suite_test.go

@@ -104,7 +104,7 @@ var _ = SynchronizedAfterSuite(
 	},
 	func() {
 		By("Dumping artifacts from the bootstrap cluster")
-		testenv.DumpBootstrapCluster(ctx)
+		testenv.DumpBootstrapCluster(ctx, bootstrapClusterProxy.GetKubeconfigPath())
 
 		config := e2e.LoadE2EConfig()
 		// skipping error check since it is already done at the beginning of the test in e2e.ValidateE2EConfig()

test/e2e/suites/chart-upgrade/suite_test.go

@@ -105,7 +105,7 @@ var _ = SynchronizedAfterSuite(
 	},
 	func() {
 		By("Dumping artifacts from the bootstrap cluster")
-		testenv.DumpBootstrapCluster(ctx)
+		testenv.DumpBootstrapCluster(ctx, bootstrapClusterProxy.GetKubeconfigPath())
 
 		config := e2e.LoadE2EConfig()
 		// skipping error check since it is already done at the beginning of the test in e2e.ValidateE2EConfig()

test/e2e/suites/import-gitops/suite_test.go

@@ -107,7 +107,7 @@ var _ = SynchronizedAfterSuite(
 	},
 	func() {
 		By("Dumping artifacts from the bootstrap cluster")
-		testenv.DumpBootstrapCluster(ctx)
+		testenv.DumpBootstrapCluster(ctx, bootstrapClusterProxy.GetKubeconfigPath())
 
 		config := e2e.LoadE2EConfig()
 		// skipping error check since it is already done at the beginning of the test in e2e.ValidateE2EConfig()

test/e2e/suites/v2prov/suite_test.go

@@ -116,7 +116,7 @@ var _ = SynchronizedAfterSuite(
 	},
 	func() {
 		By("Dumping artifacts from the bootstrap cluster")
-		testenv.DumpBootstrapCluster(ctx)
+		testenv.DumpBootstrapCluster(ctx, bootstrapClusterProxy.GetKubeconfigPath())
 
 		config := e2e.LoadE2EConfig()
 		// skipping error check since it is already done at the beginning of the test in e2e.ValidateE2EConfig()

test/testenv/cleanup.go

@@ -141,8 +141,8 @@ func CollectArtifacts(ctx context.Context, input CollectArtifactsInput) error {
 	return nil
 }
 
-func DumpBootstrapCluster(ctx context.Context) {
-	err := CollectArtifacts(ctx, CollectArtifactsInput{})
+func DumpBootstrapCluster(ctx context.Context, kubeconfigPath string) {
+	err := CollectArtifacts(ctx, CollectArtifactsInput{KubeconfigPath: kubeconfigPath})
 	if err != nil {
 		fmt.Printf("Failed to artifacts for the bootstrap cluster: %v\n", err)
 		return