Merge pull request #1311 from hongkailiu/e2e-exe-options

NO-JIRA: More flexible timeout option for oc-cli

Author: openshift-merge-bot[bot]

test/cvo/cvo.go

@@ -29,7 +29,7 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator-t
 	})
 
 	g.It("can use oc to get the version information", func() {
-		ocClient, err := oc.NewOC(logger)
+		ocClient, err := oc.NewOC(ocapi.Options{Logger: logger})
 		o.Expect(err).NotTo(o.HaveOccurred())
 		o.Expect(ocClient).NotTo(o.BeNil())
 

test/oc/api/api.go

@@ -1,5 +1,11 @@
 package api
 
+import (
+	"time"
+
+	"github.com/go-logr/logr"
+)
+
 type ReleaseExtractOptions struct {
 	To string
 }
@@ -8,6 +14,11 @@ type VersionOptions struct {
 	Client bool
 }
 
+type Options struct {
+	Logger  logr.Logger
+	Timeout time.Duration
+}
+
 type OC interface {
 	AdmReleaseExtract(o ReleaseExtractOptions) error
 	Version(o VersionOptions) (string, error)

test/oc/cli/cli.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 	"os/exec"
 	"strings"
 	"time"
@@ -62,26 +61,21 @@ func newOCExecutor(oc string, timeout time.Duration, logger logr.Logger) (execut
 }
 
 // NewOCCli return a client for oc-cli.
-func NewOCCli(logger logr.Logger) (api.OC, error) {
+func NewOCCli(o api.Options) (api.OC, error) {
 	oc, err := exec.LookPath("oc")
 	if err != nil {
 		return nil, err
 	}
-	timeout := 30 * time.Second
-	timeoutStr := os.Getenv("OC_CLI_TIMEOUT")
-	if timeoutStr != "" {
-		timeout, err = time.ParseDuration(timeoutStr)
-		if err != nil {
-			return nil, err
-		}
+	if o.Timeout == 0 {
+		o.Timeout = 30 * time.Second
 	}
 
-	executor, err := newOCExecutor(oc, timeout, logger)
+	executor, err := newOCExecutor(oc, o.Timeout, o.Logger)
 	if err != nil {
 		return nil, err
 	}
 	ret := client{
-		logger:   logger,
+		logger:   o.Logger,
 		executor: executor,
 	}
 	return &ret, nil

test/oc/oc.go

@@ -1,13 +1,11 @@
 package oc
 
 import (
-	"github.com/go-logr/logr"
-
 	"github.com/openshift/cluster-version-operator/test/oc/api"
 	"github.com/openshift/cluster-version-operator/test/oc/cli"
 )
 
 // NewOC returns OC that provides utility functions used by the e2e tests
-func NewOC(logger logr.Logger) (api.OC, error) {
-	return cli.NewOCCli(logger)
+func NewOC(o api.Options) (api.OC, error) {
+	return cli.NewOCCli(o)
 }