Merge pull request #29979 from stbenjam/csi-fix

OCPBUGS-59157: Ensure CSI tests are defined before OTE initialization

Author: openshift-merge-bot[bot]

pkg/clioptions/clusterdiscovery/csi.go

@@ -6,20 +6,21 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/openshift/origin/test/extended/storage/csi"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kubernetes/test/e2e/framework/testfiles"
 	"k8s.io/kubernetes/test/e2e/storage/external"
 	"sigs.k8s.io/yaml"
+
+	"github.com/openshift/origin/test/extended/storage/csi"
 )
 
 const (
 	CSIManifestEnvVar = "TEST_CSI_DRIVER_FILES"
 	OCPManifestEnvVar = "TEST_OCP_CSI_DRIVER_FILES"
 )
 
-// Initialize openshift/csi suite, i.e. define CSI tests from TEST_CSI_DRIVER_FILES.
-func initCSITests() error {
+// InitCSITests initializes the openshift/csi suite, i.e. define CSI tests from TEST_CSI_DRIVER_FILES.
+func InitCSITests() error {
 	ocpDrivers := sets.New[string]()
 	upstreamDrivers := sets.New[string]()
 

pkg/clioptions/clusterdiscovery/provider.go

@@ -58,7 +58,7 @@ func InitializeTestFramework(context *e2e.TestContextType, config *ClusterConfig
 	// 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() })
+	exutil.WithCleanup(func() { err = InitCSITests() })
 	if err != nil {
 		return err
 	}

pkg/test/extensions/binary.go

@@ -70,6 +70,11 @@ func InitializeOpenShiftTestsExtensionFramework() (*extension.Registry, *extensi
 	extensionRegistry := extension.NewRegistry()
 	extensionRegistry.Register(originExtension.Extension)
 
+	err := clusterdiscovery.InitCSITests()
+	if err != nil {
+		return nil, nil, err
+	}
+
 	// Build our specs from ginkgo
 	specs, err := g.BuildExtensionTestSpecsFromOpenShiftGinkgoSuite()
 	if err != nil {
@@ -190,7 +195,22 @@ func (b *TestBinary) Info(ctx context.Context) (*Extension, error) {
 		logrus.Errorf("Command output for %s: %s", binName, string(infoJson))
 		return nil, fmt.Errorf("failed running '%s info': %w\nOutput: %s", b.binaryPath, err, infoJson)
 	}
-	jsonBegins := bytes.IndexByte(infoJson, '{')
+	// Some binaries may output logging that includes JSON-like data, so we need to find the first line that starts with '{'
+	jsonBegins := -1
+	lines := bytes.Split(infoJson, []byte("\n"))
+	for i, line := range lines {
+		trimmed := bytes.TrimSpace(line)
+		if bytes.HasPrefix(trimmed, []byte("{")) {
+			// Calculate the byte offset of this line in the original output
+			jsonBegins = 0
+			for j := 0; j < i; j++ {
+				jsonBegins += len(lines[j]) + 1 // +1 for the newline character
+			}
+			jsonBegins += len(line) - len(trimmed) // Add any leading whitespace
+			break
+		}
+	}
+
 	jsonEnds := bytes.LastIndexByte(infoJson, '}')
 	if jsonBegins == -1 || jsonEnds == -1 || jsonBegins > jsonEnds {
 		logrus.Errorf("No valid JSON found in output from %s info command", binName)