From 4857be07d4dc7f67be8edea703e759464aaf2fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20St=C3=A4bler?= <cstabler@redhat.com>
Date: Wed, 20 Apr 2022 17:03:22 +0200
Subject: [PATCH] UPSTREAM: <carry>: Rerun flaky e2e tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
---
 hack/ocp-e2e-tests-handler.sh  | 3 ++-
 hack/ocp-e2e-tests-operator.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hack/ocp-e2e-tests-handler.sh b/hack/ocp-e2e-tests-handler.sh
index 79ba31aea..8f7c7233b 100755
--- a/hack/ocp-e2e-tests-handler.sh
+++ b/hack/ocp-e2e-tests-handler.sh
@@ -17,6 +17,7 @@ export KUBEVIRTCI_RUNTIME="${KUBEVIRTCI_RUNTIME:-podman}"
 export PRIMARY_NIC=enp2s0
 export FIRST_SECONDARY_NIC=enp3s0
 export SECOND_SECONDARY_NIC=enp4s0
+export FLAKE_ATTEMPTS="${FLAKE_ATTEMPTS:-5}"
 
 SKIPPED_TESTS="user-guide|bridged"
 
@@ -56,4 +57,4 @@ while ! oc get pods -n nmstate | grep handler; do sleep 1; done
 # Then wait for them to be ready
 while oc get pods -n nmstate | grep "0/1"; do sleep 1; done
 # NOTE(bnemec): The test being filtered with "bridged" was re-enabled in 4.8, but seems to be consistently failing on OCP.
-make test-e2e-handler E2E_TEST_ARGS="--skip=\"${SKIPPED_TESTS}\"" E2E_TEST_TIMEOUT=120h
+make test-e2e-handler E2E_TEST_ARGS="--skip=\"${SKIPPED_TESTS}\" --flakeAttempts=${FLAKE_ATTEMPTS}" E2E_TEST_TIMEOUT=120h
diff --git a/hack/ocp-e2e-tests-operator.sh b/hack/ocp-e2e-tests-operator.sh
index faeaa3900..cb07a6cbe 100755
--- a/hack/ocp-e2e-tests-operator.sh
+++ b/hack/ocp-e2e-tests-operator.sh
@@ -14,6 +14,7 @@ export KUBEVIRT_PROVIDER=external
 export IMAGE_BUILDER="${IMAGE_BUILDER:-podman}"
 export DEV_IMAGE_REGISTRY="${DEV_IMAGE_REGISTRY:-quay.io}"
 export KUBEVIRTCI_RUNTIME="${KUBEVIRTCI_RUNTIME:-podman}"
+export FLAKE_ATTEMPTS="${FLAKE_ATTEMPTS:-5}"
 
 make cluster-sync-operator
-make test-e2e-operator
+make test-e2e-operator E2E_TEST_ARGS="--flakeAttempts=${FLAKE_ATTEMPTS}"