remove duplicate tests from openshift-tests-kubernetes

Dockerfile.rhel

@@ -1,12 +1,24 @@
 FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
-WORKDIR /go/src/github.com/openshift/extended-platform-tests
+WORKDIR /go/src/github.com/openshift/openshift-tests
 COPY . .
 RUN make build WHAT=cmd/extended-platform-tests && \
     mkdir -p /tmp/build && \
-    cp /go/src/github.com/openshift/extended-platform-tests/extended-platform-tests /tmp/build/extended-platform-tests
+    cp /go/src/github.com/openshift/openshift-tests/extended-platform-tests /tmp/build/extended-platform-tests
 
-FROM registry.svc.ci.openshift.org/ocp/4.3:cli
+FROM registry.svc.ci.openshift.org/ocp/4.4:tests-kubernetes AS builder1
+RUN mkdir -p /tmp/build && \
+    cp /usr/bin/openshift-tests-kubernetes /tmp/build/openshift-tests-kubernetes
+
+# this is temporary, remove once we transition from openshift-tests binary to openshift-tests-kubernetes,extended-platorm-tests
+FROM registry.svc.ci.openshift.org/ocp/4.4:tests AS builder2
+RUN mkdir -p /tmp/build && \
+    cp /usr/bin/openshift-tests /tmp/build/openshift-tests
+
+FROM registry.svc.ci.openshift.org/ocp/4.4:cli
 COPY --from=builder /tmp/build/extended-platform-tests /usr/bin/
+COPY --from=builder1 /tmp/build/openshift-tests-kubernetes /usr/bin/
+# this will be removed once transition from openshift-tests binary to openshift-tests-kubernetes,extended-platform-tests
+COPY --from=builder2 /tmp/build/openshift-tests /usr/bin/
 LABEL io.k8s.display-name="OpenShift Extended Platform Tests" \
       io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
       io.openshift.tags="openshift,tests,extended-platform"

cmd/extended-platform-tests/e2e.go

@@ -9,6 +9,7 @@ import (
 	"github.com/openshift/openshift-tests/pkg/test/ginkgo"
 
 	_ "github.com/openshift/openshift-tests/test/extended"
+	_ "github.com/openshift/openshift-tests/test/extended/util/annotate/generated"
 )
 
 // staticSuites are all known test suites this binary should run
@@ -140,7 +141,7 @@ var staticSuites = []*ginkgo.TestSuite{
         See https://github.com/kubernetes/kubernetes/blob/master/test/e2e/storage/external/README.md for required format of the files.
 		`),
 		Matches: func(name string) bool {
-			return strings.Contains(name, "[Suite:openshift/csi") && !strings.Contains(name, "[Disruptive]")
+			return strings.Contains(name, "External Storage [Driver:") && !strings.Contains(name, "[Disruptive]")
 		},
 	},
 	{

cmd/extended-platform-tests/openshift-tests.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"encoding/json"
 	"flag"
 	goflag "flag"
 	"fmt"
@@ -10,27 +9,17 @@ import (
 	"os"
 	"time"
 
-	"github.com/onsi/ginkgo"
-	"github.com/onsi/gomega"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
 	utilflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
-	"k8s.io/klog"
 	"k8s.io/kubectl/pkg/util/templates"
-	reale2e "k8s.io/kubernetes/test/e2e"
-	e2e "k8s.io/kubernetes/test/e2e/framework"
 
 	"github.com/openshift/library-go/pkg/serviceability"
 	"github.com/openshift/openshift-tests/pkg/monitor"
 	testginkgo "github.com/openshift/openshift-tests/pkg/test/ginkgo"
 	exutil "github.com/openshift/openshift-tests/test/extended/util"
-	exutilcloud "github.com/openshift/openshift-tests/test/extended/util/cloud"
-
-	// these are loading important global flags that we need to get and set
-	_ "k8s.io/kubernetes/test/e2e"
-	_ "k8s.io/kubernetes/test/e2e/lifecycle"
 )
 
 func main() {
@@ -54,7 +43,6 @@ func main() {
 
 	root.AddCommand(
 		newRunCommand(),
-		newRunUpgradeCommand(),
 		newRunTestCommand(),
 		newRunMonitorCommand(),
 	)
@@ -122,83 +110,21 @@ func newRunCommand() *cobra.Command {
 		SilenceErrors: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return mirrorToFile(opt, func() error {
-				if err := initProvider(opt.Provider, opt.DryRun); err != nil {
+				config, err := decodeProvider(opt.Provider, opt.DryRun, true)
+				if err != nil {
 					return err
 				}
-
-				e2e.AfterReadingAllFlags(exutil.TestContext)
-				e2e.TestContext.DumpLogsOnFailure = true
-				exutil.TestContext.DumpLogsOnFailure = true
-				return opt.Run(args)
-			})
-		},
-	}
-	bindOptions(opt, cmd.Flags())
-	return cmd
-}
-
-func newRunUpgradeCommand() *cobra.Command {
-	opt := &testginkgo.Options{Suites: upgradeSuites}
-	upgradeOpt := &UpgradeOptions{}
-
-	cmd := &cobra.Command{
-		Use:   "run-upgrade SUITE",
-		Short: "Run an upgrade suite",
-		Long: templates.LongDesc(`
-		Run an upgrade test suite against an OpenShift server
-
-		This command will run one of the following suites against a cluster identified by the current
-		KUBECONFIG file. See the suite description for more on what actions the suite will take.
-
-		If you specify the --dry-run argument, the actions the suite will take will be printed to the
-		output.
-
-		Supported options:
-
-		* abort-at=NUMBER - Set to a number between 0 and 100 to control the percent of operators
-		at which to stop the current upgrade and roll back to the current version.
-		* disrupt-reboot=POLICY - During upgrades, periodically reboot master nodes. If set to 'graceful'
-		the reboot will allow the node to shut down services in an orderly fashion. If set to 'force' the
-		machine will terminate immediately without clean shutdown.
-
-		`) + testginkgo.SuitesString(opt.Suites, "\n\nAvailable upgrade suites:\n\n"),
-
-		SilenceUsage:  true,
-		SilenceErrors: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return mirrorToFile(opt, func() error {
-				if len(upgradeOpt.ToImage) == 0 {
-					return fmt.Errorf("--to-image must be specified to run an upgrade test")
-				}
-
-				if len(args) > 0 {
-					for _, suite := range opt.Suites {
-						if suite.Name == args[0] {
-							upgradeOpt.Suite = suite.Name
-							upgradeOpt.JUnitDir = opt.JUnitDir
-							value := upgradeOpt.ToEnv()
-							if err := initUpgrade(value); err != nil {
-								return err
-							}
-							opt.SuiteOptions = value
-							break
-						}
-					}
-				}
-
-				if err := initProvider(opt.Provider, opt.DryRun); err != nil {
+				opt.Provider = config.ToJSONString()
+				matchFn, err := initializeTestFramework(exutil.TestContext, config, opt.DryRun)
+				if err != nil {
 					return err
 				}
-				e2e.AfterReadingAllFlags(exutil.TestContext)
-				e2e.TestContext.DumpLogsOnFailure = true
-				exutil.TestContext.DumpLogsOnFailure = true
+				opt.MatchFn = matchFn
 				return opt.Run(args)
 			})
 		},
 	}
-
 	bindOptions(opt, cmd.Flags())
-	bindUpgradeOptions(upgradeOpt, cmd.Flags())
 	return cmd
 }
 
@@ -221,15 +147,14 @@ func newRunTestCommand() *cobra.Command {
 		SilenceUsage:  true,
 		SilenceErrors: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := initProvider(os.Getenv("TEST_PROVIDER"), testOpt.DryRun); err != nil {
+			config, err := decodeProvider(os.Getenv("TEST_PROVIDER"), testOpt.DryRun, false)
+			if err != nil {
 				return err
 			}
-			if err := initUpgrade(os.Getenv("TEST_SUITE_OPTIONS")); err != nil {
+			if _, err := initializeTestFramework(exutil.TestContext, config, testOpt.DryRun); err != nil {
 				return err
 			}
-			e2e.AfterReadingAllFlags(exutil.TestContext)
-			e2e.TestContext.DumpLogsOnFailure = true
-			exutil.TestContext.DumpLogsOnFailure = true
+
 			return testOpt.Run(args)
 		},
 	}
@@ -241,23 +166,28 @@ func newRunTestCommand() *cobra.Command {
 // any error returned from fn. The function returns fn() or any error encountered while
 // attempting to open the file.
 func mirrorToFile(opt *testginkgo.Options, fn func() error) error {
+	if opt.Out == nil {
+		opt.Out = os.Stdout
+	}
+	if opt.ErrOut == nil {
+		opt.ErrOut = os.Stderr
+	}
 	if len(opt.OutFile) == 0 {
-		opt.Out, opt.ErrOut = os.Stdout, os.Stderr
 		return fn()
 	}
 
 	f, err := os.OpenFile(opt.OutFile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0640)
 	if err != nil {
 		return err
 	}
-	opt.Out = io.MultiWriter(os.Stdout, f)
-	opt.ErrOut = io.MultiWriter(os.Stderr, f)
+	opt.Out = io.MultiWriter(opt.Out, f)
+	opt.ErrOut = io.MultiWriter(opt.ErrOut, f)
 	exitErr := fn()
 	if exitErr != nil {
 		fmt.Fprintf(f, "error: %s", exitErr)
 	}
 	if err := f.Close(); err != nil {
-		fmt.Fprintf(os.Stderr, "error: Unable to close output file\n")
+		fmt.Fprintf(opt.ErrOut, "error: Unable to close output file\n")
 	}
 	return exitErr
 }
@@ -274,68 +204,3 @@ func bindOptions(opt *testginkgo.Options, flags *pflag.FlagSet) {
 	flags.DurationVar(&opt.Timeout, "timeout", opt.Timeout, "Set the maximum time a test can run before being aborted. This is read from the suite by default, but will be 10 minutes otherwise.")
 	flags.BoolVar(&opt.IncludeSuccessOutput, "include-success", opt.IncludeSuccessOutput, "Print output from successful tests.")
 }
-
-func initProvider(provider string, dryRun bool) error {
-	// record the exit error to the output file
-	if err := decodeProviderTo(provider, exutil.TestContext, dryRun); err != nil {
-		return err
-	}
-	exutil.TestContext.AllowedNotReadyNodes = 100
-	exutil.TestContext.MaxNodesToGather = 0
-	reale2e.SetViperConfig(os.Getenv("VIPERCONFIG"))
-
-	if err := initCSITests(dryRun); err != nil {
-		return err
-	}
-
-	exutil.AnnotateTestSuite()
-	err := exutil.InitTest(dryRun)
-	gomega.RegisterFailHandler(ginkgo.Fail)
-
-	// TODO: infer SSH keys from the cluster
-	return err
-}
-
-func decodeProviderTo(provider string, testContext *e2e.TestContextType, dryRun bool) error {
-	switch provider {
-	case "":
-		if _, ok := os.LookupEnv("KUBE_SSH_USER"); ok {
-			if _, ok := os.LookupEnv("LOCAL_SSH_KEY"); ok {
-				testContext.Provider = "local"
-				break
-			}
-		}
-		if dryRun {
-			break
-		}
-		fallthrough
-
-	case "azure", "aws", "gce", "vsphere":
-		provider, cfg, err := exutilcloud.LoadConfig()
-		if err != nil {
-			return err
-		}
-		if cfg != nil {
-			testContext.Provider = provider
-			testContext.CloudConfig = *cfg
-		}
-
-	default:
-		var providerInfo struct{ Type string }
-		if err := json.Unmarshal([]byte(provider), &providerInfo); err != nil {
-			return fmt.Errorf("provider must be a JSON object with the 'type' key at a minimum: %v", err)
-		}
-		if len(providerInfo.Type) == 0 {
-			return fmt.Errorf("provider must be a JSON object with the 'type' key")
-		}
-		testContext.Provider = providerInfo.Type
-		if err := json.Unmarshal([]byte(provider), &testContext.CloudConfig); err != nil {
-			return fmt.Errorf("provider must decode into the cloud config object: %v", err)
-		}
-	}
-	if len(testContext.Provider) == 0 {
-		testContext.Provider = "skeleton"
-	}
-	klog.V(2).Infof("Provider %s: %#v", testContext.Provider, testContext.CloudConfig)
-	return nil
-}