Merge pull request #1153 from openshift-cherrypick-robot/cherry-pick-1150-to-release-4.14

[release-4.14] OCPBUGS-44048: fix proxy config and leader election test flakes

Author: openshift-merge-bot[bot]

test/e2e/configuration_test.go

@@ -265,7 +265,10 @@ func TestRouteConfiguration(t *testing.T) {
 
 func TestOperatorProxyConfiguration(t *testing.T) {
 	te := framework.SetupAvailableImageRegistry(t, nil)
-	defer framework.TeardownImageRegistry(te)
+	// this test sometimes fails during tear down because some components
+	// (unrelated to the image registry) do not recover within the default
+	// timeout.
+	defer framework.TeardownImageRegistryWithTimeoutIncrement(te, 5*time.Minute)
 	defer framework.ResetClusterProxyConfig(te)
 
 	// Get the service network to set as NO_PROXY so that the

test/e2e/leaderelection_test.go

@@ -2,7 +2,7 @@ package e2e_test
 
 import (
 	"context"
-	"strings"
+	"regexp"
 	"testing"
 	"time"
 
@@ -50,22 +50,17 @@ func TestLeaderElection(t *testing.T) {
 		t.Fatalf("error reading operator logs: %v", err)
 	}
 
-	awaitingPods := int32(0)
+	re := regexp.MustCompile(".*successfully acquired lease.*")
+	acquiredLease := 0
 	for _, podLogs := range allLogs {
 		for _, containerLogs := range podLogs {
-			lastLine := len(containerLogs) - 1
-			if lastLine < 0 {
-				continue
-			}
-
-			if strings.Contains(containerLogs[lastLine], "attempting to acquire leader lease") {
-				awaitingPods++
+			if containerLogs.Contains(re) {
+				acquiredLease++
 			}
 		}
 	}
 
-	numberOfAwaitingPods := numberOfReplicas - 1
-	if awaitingPods != numberOfAwaitingPods {
-		t.Errorf("multiple operators running at the same time")
+	if acquiredLease > 1 {
+		t.Errorf("multiple operators running at the same time, %d pods acquired lease, expected 1.", acquiredLease)
 	}
 }

test/framework/imageregistry.go

@@ -580,8 +580,8 @@ func SetupAvailableImageRegistry(t *testing.T, spec *imageregistryapiv1.ImageReg
 	return te
 }
 
-func TeardownImageRegistry(te TestEnv) {
-	defer WaitUntilClusterOperatorsAreHealthy(te, 10*time.Second, AsyncOperationTimeout)
+func TeardownImageRegistryWithTimeoutIncrement(te TestEnv, timeoutIncrement time.Duration) {
+	defer WaitUntilClusterOperatorsAreHealthy(te, 10*time.Second, AsyncOperationTimeout+timeoutIncrement)
 	defer CheckAbsenceOfOperatorPods(te)
 	defer RemoveImageRegistry(te)
 	defer CheckPodsAreNotRestarted(te, labels.Everything())
@@ -591,3 +591,7 @@ func TeardownImageRegistry(te TestEnv) {
 		DumpOperatorLogs(context.Background(), te)
 	}
 }
+
+func TeardownImageRegistry(te TestEnv) {
+	TeardownImageRegistryWithTimeoutIncrement(te, 0)
+}