Merge pull request #29173 from neisw/revert-29025-external_bin_registry

TRT-1851: Revert "NO-JIRA: external binary registry"

Author: openshift-merge-bot[bot]

pkg/test/ginkgo/cmd_runsuite.go

@@ -4,10 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/openshift/origin/pkg/monitortestlibrary/platformidentification"
-	"github.com/openshift/origin/test/extended/util"
 	"io/ioutil"
-	"log"
 	"math/rand"
 	"os"
 	"os/signal"
@@ -125,36 +122,6 @@ func max(a, b int) int {
 	return b
 }
 
-type RunMatchFunc func(run *RunInformation) bool
-
-type RunInformation struct {
-	// jobType may be nil for topologies without
-	// platform identification.
-	*platformidentification.JobType
-	suite *TestSuite
-}
-
-type externalBinaryStruct struct {
-	// The payload image tag in which an external binary path can be found
-	imageTag string
-	// The binary path to extract from the image
-	binaryPath string
-
-	// nil, nil - run for all suites
-	// (), nil, - run for only those matched by include
-	// nil, () - run for all except excluded
-	// (), () - include overridden by exclude
-	includeForRun RunMatchFunc
-	excludeForRun RunMatchFunc
-}
-
-type externalBinaryResult struct {
-	err            error
-	skipReason     string
-	externalBinary *externalBinaryStruct
-	externalTests  []*testCase
-}
-
 func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, junitSuiteName string, monitorTestInfo monitortestframework.MonitorTestInitializationInfo, upgrade bool) error {
 	ctx := context.Background()
 
@@ -163,95 +130,17 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, junitSuiteName string, mon
 		return fmt.Errorf("failed reading origin test suites: %w", err)
 	}
 
-	fmt.Fprintf(o.Out, "Found %d tests for in openshift-tests binary for suite %q\n", len(tests), suite.Name)
+	fmt.Fprintf(o.Out, "found %d tests for suite\n", len(tests))
 
 	var fallbackSyntheticTestResult []*junitapi.JUnitTestCase
 	if len(os.Getenv("OPENSHIFT_SKIP_EXTERNAL_TESTS")) == 0 {
-		// A registry of available external binaries and in which image
-		// they reside in the payload.
-		externalBinaries := []externalBinaryStruct{
-			{
-				imageTag:   "hyperkube",
-				binaryPath: "/usr/bin/k8s-tests",
-			},
-		}
-
-		var (
-			externalTests []*testCase
-			wg            sync.WaitGroup
-			resultCh      = make(chan externalBinaryResult, len(externalBinaries))
-			err           error
-		)
-
-		// Lines logged to this logger will be included in the junit output for the
-		// external binary usage synthetic.
-		var extractDetailsBuffer bytes.Buffer
-		extractLogger := log.New(&extractDetailsBuffer, "", log.LstdFlags|log.Lmicroseconds)
-
-		oc := util.NewCLIWithoutNamespace("default")
-		jobType, err := platformidentification.GetJobType(context.Background(), oc.AdminConfig())
-		if err != nil {
-			// Microshift does not permit identification. External binaries must
-			// tolerate nil jobType.
-			extractLogger.Printf("Failed determining job type: %v", err)
-		}
-
-		runInformation := &RunInformation{
-			JobType: jobType,
-			suite:   suite,
-		}
-
-		releaseImageReferences, err := extractReleaseImageStream(extractLogger)
-		if err != nil {
-			return fmt.Errorf("unable to extract image references from release payload: %w", err)
-		}
-
-		for _, externalBinary := range externalBinaries {
-			wg.Add(1)
-			go func(externalBinary externalBinaryStruct) {
-				defer wg.Done()
-
-				var skipReason string
-				if (externalBinary.includeForRun != nil && !externalBinary.includeForRun(runInformation)) ||
-					(externalBinary.excludeForRun != nil && externalBinary.excludeForRun(runInformation)) {
-					skipReason = "excluded by suite selection functions"
-				}
-
-				var tagTestSet []*testCase
-				var tagErr error
-				if len(skipReason) == 0 {
-					tagTestSet, tagErr = externalTestsForSuite(ctx, extractLogger, releaseImageReferences, externalBinary.imageTag, externalBinary.binaryPath)
-				}
-
-				resultCh <- externalBinaryResult{
-					err:            tagErr,
-					skipReason:     skipReason,
-					externalBinary: &externalBinary,
-					externalTests:  tagTestSet,
-				}
-
-			}(externalBinary)
-		}
-
-		wg.Wait()
-		close(resultCh)
-
-		for result := range resultCh {
-			if result.skipReason != "" {
-				extractLogger.Printf("Skipping test discovery for image %q and binary %q: %v\n", result.externalBinary.imageTag, result.externalBinary.binaryPath, result.skipReason)
-			} else if result.err != nil {
-				extractLogger.Printf("Error during test discovery for image %q and binary %q: %v\n", result.externalBinary.imageTag, result.externalBinary.binaryPath, result.err)
-				err = result.err
-			} else {
-				extractLogger.Printf("Discovered %v tests from image %q and binary %q\n", len(result.externalTests), result.externalBinary.imageTag, result.externalBinary.binaryPath)
-				externalTests = append(externalTests, result.externalTests...)
-			}
-		}
-
+		buf := &bytes.Buffer{}
+		fmt.Fprintf(buf, "Attempting to pull tests from external binary...\n")
+		externalTests, err := externalTestsForSuite(ctx)
 		if err == nil {
-			var filteredTests []*testCase
+			filteredTests := []*testCase{}
 			for _, test := range tests {
-				// tests contains all the tests "registered" in openshift-tests binary,
+				// tests contains all the tests "registered" in openshif-tests binary,
 				// this also includes vendored k8s tests, since this path assumes we're
 				// using external binary to run these tests we need to remove them
 				// from the final lists, which contains:
@@ -262,29 +151,29 @@ func (o *GinkgoRunSuiteOptions) Run(suite *TestSuite, junitSuiteName string, mon
 				}
 			}
 			tests = append(filteredTests, externalTests...)
-			extractLogger.Printf("Discovered a total of %v external tests and will run a total of %v\n", len(externalTests), len(tests))
+			fmt.Fprintf(buf, "Got %d tests from external binary\n", len(externalTests))
 		} else {
-			extractLogger.Printf("Errors encountered while extracting one or more external test suites; Falling back to built-in suite: %v\n", err)
+			fmt.Fprintf(buf, "Falling back to built-in suite, failed reading external test suites: %v\n", err)
 			// adding this test twice (one failure here, and success below) will
 			// ensure it gets picked as flake further down in synthetic tests processing
 			fallbackSyntheticTestResult = append(fallbackSyntheticTestResult, &junitapi.JUnitTestCase{
 				Name:      "[sig-arch] External binary usage",
-				SystemOut: extractDetailsBuffer.String(),
+				SystemOut: buf.String(),
 				FailureOutput: &junitapi.FailureOutput{
-					Output: extractDetailsBuffer.String(),
+					Output: buf.String(),
 				},
 			})
 		}
-		fmt.Fprintf(o.Out, extractDetailsBuffer.String())
+		fmt.Fprintf(o.Out, buf.String())
 		fallbackSyntheticTestResult = append(fallbackSyntheticTestResult, &junitapi.JUnitTestCase{
 			Name:      "[sig-arch] External binary usage",
-			SystemOut: extractDetailsBuffer.String(),
+			SystemOut: buf.String(),
 		})
 	} else {
 		fmt.Fprintf(o.Out, "Using built-in tests only due to OPENSHIFT_SKIP_EXTERNAL_TESTS being set\n")
 	}
 
-	fmt.Fprintf(o.Out, "Found %d tests (including externals)\n", len(tests))
+	fmt.Fprintf(o.Out, "found %d tests (incl externals)\n", len(tests))
 
 	// this ensures the tests are always run in random order to avoid
 	// any intra-tests dependencies