Use compat_otp library in extended test cases

Author: sergiordlr

cmd/machine-config-tests-ext/main.go

@@ -9,7 +9,7 @@ import (
 	"github.com/openshift-eng/openshift-tests-extension/pkg/cmd"
 	v "github.com/openshift-eng/openshift-tests-extension/pkg/version"
 	"github.com/openshift/machine-config-operator/pkg/version"
-	exutil "github.com/openshift/machine-config-operator/test/extended/util"
+	compat_otp "github.com/openshift/origin/test/extended/util/compat_otp"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 
 	"github.com/spf13/cobra"
@@ -54,14 +54,14 @@ func main() {
 		Long: "MCO Extended Test Suite (OTE Based)",
 	}
 
-	exutil.InitStandardFlags()
+	compat_otp.InitStandardFlags()
 	specs.AddBeforeAll(func() {
-		if err := exutil.InitTest(false); err != nil {
+		if err := compat_otp.InitTest(false); err != nil {
 			panic(err)
 		}
-		e2e.AfterReadingAllFlags(exutil.TestContext)
+		e2e.AfterReadingAllFlags(compat_otp.TestContext)
 		e2e.TestContext.DumpLogsOnFailure = true
-		exutil.TestContext.DumpLogsOnFailure = true
+		compat_otp.TestContext.DumpLogsOnFailure = true
 	})
 
 	root.AddCommand(

go.mod

@@ -0,0 +1,46 @@
+package extended
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	exutil "github.com/openshift/origin/test/extended/util"
+	compat_otp "github.com/openshift/origin/test/extended/util/compat_otp"
+	logger "github.com/openshift/origin/test/extended/util/compat_otp/logext"
+
+	"k8s.io/apimachinery/pkg/util/wait"
+)
+
+// AssertAllPodsToBeReadyWithPollerParams assert all pods in NS are in ready state until timeout in a given namespace
+// Pros: allow user to customize poller parameters
+func AssertAllPodsToBeReadyWithPollerParams(oc *exutil.CLI, namespace string, interval, timeout time.Duration, selector string) {
+	err := wait.PollUntilContextTimeout(context.Background(), interval, timeout, false, func(_ context.Context) (bool, error) {
+
+		// get the status flag for all pods
+		// except the ones which are in Complete Status.
+		// it use 'ne' operator which is only compatible with 4.10+ oc versions
+		template := "'{{- range .items -}}{{- range .status.conditions -}}{{- if ne .reason \"PodCompleted\" -}}{{- if eq .type \"Ready\" -}}{{- .status}} {{\" \"}}{{- end -}}{{- end -}}{{- end -}}{{- end -}}'"
+		baseArgs := []string{"pods", "-n", namespace}
+		if selector != "" {
+			baseArgs = append(baseArgs, "-l", selector)
+		}
+		stdout, err := oc.AsAdmin().Run("get").Args(baseArgs...).Template(template).Output()
+		if err != nil {
+			logger.Infof("the err:%v, and try next round", err)
+			return false, nil
+		}
+		if strings.Contains(stdout, "False") {
+			return false, nil
+		}
+		return true, nil
+	})
+	compat_otp.AssertWaitPollNoErr(err, fmt.Sprintf("Some Pods are not ready in NS %s!", namespace))
+}
+
+// AssertAllPodsToBeReadyWithSelector assert all pods in NS are in ready state until timeout in a given namespace
+// The selector parameter follows the regular oc/kubectl format for the --selector option.
+func AssertAllPodsToBeReadyWithSelector(oc *exutil.CLI, namespace, selector string) {
+	AssertAllPodsToBeReadyWithPollerParams(oc, namespace, 10*time.Second, 4*time.Minute, selector)
+}

go.sum

@@ -17,7 +17,7 @@ import (
 	machineclient "github.com/openshift/client-go/machine/clientset/versioned"
 	machineconfigclient "github.com/openshift/client-go/machineconfiguration/clientset/versioned"
 	mcopclient "github.com/openshift/client-go/operator/clientset/versioned"
-	exutil "github.com/openshift/machine-config-operator/test/extended/util"
+	exutil "github.com/openshift/origin/test/extended/util"
 
 	o "github.com/onsi/gomega"
 

test/extended/assertions.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	machineclient "github.com/openshift/client-go/machine/clientset/versioned"
-	exutil "github.com/openshift/machine-config-operator/test/extended/util"
+	exutil "github.com/openshift/origin/test/extended/util"
 
 	o "github.com/onsi/gomega"
 

test/extended/boot_image.go

@@ -11,7 +11,8 @@ import (
 
 	g "github.com/onsi/ginkgo/v2"
 	o "github.com/onsi/gomega"
-	exutil "github.com/openshift/machine-config-operator/test/extended/util"
+	exutil "github.com/openshift/origin/test/extended/util"
+	compat_otp "github.com/openshift/origin/test/extended/util/compat_otp"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -26,7 +27,7 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive
 		PartialMachineSetFixture = filepath.Join("machineconfigurations", "managedbootimages-partial.yaml")
 		EmptyMachineSetFixture   = filepath.Join("machineconfigurations", "managedbootimages-empty.yaml")
 
-		oc = exutil.NewCLI("mco-bootimage", exutil.KubeConfigPath()).AsAdmin()
+		oc = compat_otp.NewCLI("mco-bootimage", compat_otp.KubeConfigPath()).AsAdmin()
 	)
 
 	g.BeforeEach(func() {

test/extended/boot_image_update_agnostic.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	o "github.com/onsi/gomega"
-	exutil "github.com/openshift/machine-config-operator/test/extended/util"
+	exutil "github.com/openshift/origin/test/extended/util"
 )
 
 // ConfigMap struct encapsulates the functionalities regarding ocp configmaps

test/extended/boot_image_update_azure.go

@@ -1,8 +1,8 @@
 package extended
 
 import (
-	exutil "github.com/openshift/machine-config-operator/test/extended/util"
-	logger "github.com/openshift/machine-config-operator/test/extended/util/logext"
+	exutil "github.com/openshift/origin/test/extended/util"
+	logger "github.com/openshift/origin/test/extended/util/compat_otp/logext"
 )
 
 func getImageFromReleaseInfo(oc *exutil.CLI, imageName, dockerConfigFile string) (string, error) {

test/extended/configmap.go

@@ -5,8 +5,9 @@ import (
 	"strings"
 	"time"
 
-	exutil "github.com/openshift/machine-config-operator/test/extended/util"
-	logger "github.com/openshift/machine-config-operator/test/extended/util/logext"
+	exutil "github.com/openshift/origin/test/extended/util"
+	compat_otp "github.com/openshift/origin/test/extended/util/compat_otp"
+	logger "github.com/openshift/origin/test/extended/util/compat_otp/logext"
 )
 
 // Controller handles the functinalities related to the MCO controller pod
@@ -81,7 +82,7 @@ func (mcc Controller) GetRawLogs() (string, error) {
 		logger.Errorf("Error getting controller pod name. Error: %s", err)
 		return "", err
 	}
-	podAllLogs, err := exutil.GetSpecificPodLogs(mcc.oc, MachineConfigNamespace, ControllerContainer, cachedPodName, "")
+	podAllLogs, err := compat_otp.GetSpecificPodLogs(mcc.oc, MachineConfigNamespace, ControllerContainer, cachedPodName, "")
 	if err != nil {
 		logger.Errorf("Error getting log lines. Error: %s", err)
 		return "", err