UPSTREAM: <carry>: Push CSI suite initialization to updateTestFrameworkForTests

It logs, and the logs go right to stdout, where openshift-tests reads json
from "k8s-tests-ext list" and "info".

Author: jsafrane

openshift-hack/cmd/k8s-tests-ext/provider.go

@@ -40,16 +40,6 @@ func initializeCommonTestFramework() error {
 	testContext.MaxNodesToGather = 0
 	testContext.KubeConfig = os.Getenv("KUBECONFIG")
 
-	// allow the CSI tests to access test data, but only briefly
-	// TODO: ideally CSI would not use any of these test methods
-	// var err error
-	// exutil.WithCleanup(func() { err = initCSITests(dryRun) })
-	// TODO: for now I'm only initializing CSI directly, but we probably need that
-	// WithCleanup here as well
-	if err := initCSITests(); err != nil {
-		return err
-	}
-
 	if ad := os.Getenv("ARTIFACT_DIR"); len(strings.TrimSpace(ad)) == 0 {
 		os.Setenv("ARTIFACT_DIR", filepath.Join(os.TempDir(), "artifacts"))
 	}
@@ -126,6 +116,16 @@ func updateTestFrameworkForTests(provider string) error {
 	testContext.DumpLogsOnFailure = true
 	testContext.ReportDir = os.Getenv("TEST_JUNIT_DIR")
 
+	// allow the CSI tests to access test data, but only briefly
+	// TODO: ideally CSI would not use any of these test methods
+	// var err error
+	// exutil.WithCleanup(func() { err = initCSITests(dryRun) })
+	// TODO: for now I'm only initializing CSI directly, but we probably need that
+	// WithCleanup here as well
+	if err := initCSITests(); err != nil {
+		return err
+	}
+
 	return nil
 }